Tested of refactored code

1 files changed, 33 insertions, 35 deletions

diff --git a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml
index 5d69175ae..a1ef2081f 100644
--- a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml
+++ b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml
@@ -1,8 +1,7 @@
 ---
-
-  - fail: msg="This role requires the following vars to be defined: openshift_hosted_logging_master_public_url, openshift_hosted_logging_hostname, penshift_hosted_logging_elasticsearchs_cluster_size"
+  - fail: msg="This role requires the following vars to be defined. openshift_hosted_logging_master_public_url, openshift_hosted_logging_hostname, openshift_hosted_logging_elasticsearch_cluster_size"
     when: "openshift_hosted_logging_hostname is not defined or
-          penshift_hosted_logging_elasticsearchs_cluster_size is not defined or
+          openshift_hosted_logging_elasticsearch_cluster_size is not defined or
           openshift_hosted_logging_master_public_url is not defined"
 
   - name: Create temp directory for kubeconfig
@@ -15,17 +14,14 @@
       cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ mktemp.stdout }}/admin.kubeconfig
     changed_when: False
 
-
   - name: "Create logging project"
     command: oadm new-project logging
-    when: logging_project.rc != 0
-
 
   - name: "Changing projects"
-    command: oc project logging
+    command:  "{{ openshift.common.client_binary }} project logging"
 
   - name: "Creating logging deployer secret"
-    command: oc secrets new logging-deployer {{ openshift_hosted_logging_secret_vars | default('nothing=/dev/null') }}
+    command: " {{ openshift.common.client_binary }} secrets new logging-deployer {{ openshift_hosted_logging_secret_vars | default('nothing=/dev/null') }}"
     register: secret_output
     failed_when: "secret_output.rc == 1 and 'exists' not in secret_output.stderr"
 
@@ -35,12 +31,12 @@
           force=yes
 
   - name: "Create logging-deployer service account"
-    shell: oc create -f  /tmp/logging-deployer-sa.yaml
+    command:  "{{ openshift.common.client_binary }} create -f  /tmp/logging-deployer-sa.yaml"
     register: deployer_output
     failed_when: "deployer_output.rc == 1 and 'exists' not in deployer_output.stderr"
 
   - name: "Set permissions for logging-deployer service account"
-    command: oc policy add-role-to-user edit system:serviceaccount:logging:logging-deployer
+    command:  "{{ openshift.common.client_binary }} policy add-role-to-user edit system:serviceaccount:logging:logging-deployer"
     register: permiss_output
     failed_when: "permiss_output.rc == 1 and 'exists' not in permiss_output.stderr"
 
@@ -55,53 +51,55 @@
     failed_when: "fluentd2_output.rc == 1 and 'exists' not in fluentd2_output.stderr"
 
   - name: "Create deployer template"
-    command: oc create -f /usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml -n openshift
+    command:  "{{ openshift.common.client_binary }} create -f /usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml -n openshift"
     register: template_output
     failed_when: "template_output.rc == 1 and 'exists' not in template_output.stderr"
 
-  - name: "Process the deployer template with an registry other than registry.access.redhat.com"
-    shell: oc process logging-deployer-template -n openshift -v {{ oc_process_values}} | oc create -f -
+  - name: "Process the deployer template"
+    shell:  "{{ openshift.common.client_binary }} process logging-deployer-template -n openshift -v {{ oc_process_values }} |  {{ openshift.common.client_binary }} create -f -"
 
   - name: "Wait for image pull and deployer pod"
-     shell: oc get pods | grep logging-deployer.*Completed
-     register: result
-     until: result.rc == 0
-     retries: 15
-     delay: 10
+    shell:  "{{ openshift.common.client_binary }} get pods | grep logging-deployer.*Completed"
+    register: result
+    until: result.rc == 0
+    retries: 15
+    delay: 10
 
   - name: "Process support template"
-    shell: oc process logging-support-template | oc create -f -
+    shell:  "{{ openshift.common.client_binary }} process logging-support-template |  {{ openshift.common.client_binary }} create -f -"
 
   - name: "Set insecured registry"
-    command: oc annotate is --all  openshift.io/image.insecureRepository=true --overwrite
+    command:  "{{ openshift.common.client_binary }} annotate is --all  openshift.io/image.insecureRepository=true --overwrite"
     when: "target_registry is defined and insecure_registry == 'true'"
 
-  - name: "Scale fluentd deployment config"
-    command: oc scale dc/logging-fluentd --replicas={{ fluentd_replicas | default('1') }}
-
   - name: "Wait for imagestreams to become available"
-    shell: oc get is | grep logging-fluentd
+    shell:  "{{ openshift.common.client_binary }} get is | grep logging-fluentd"
     register: result
     until: result.rc == 0
     failed_when: result.rc == 1 and 'not found' not in result.stderr
-    retries: 15
-    delay: 5
-
+    retries: 20
+    delay: 10
+    
   - name: "Wait for replication controllers to become available"
-    shell: oc get rc | grep logging-fluentd-1
+    shell:  "{{ openshift.common.client_binary }} get rc | grep logging-fluentd-1"
     register: result
     until: result.rc == 0
     failed_when: result.rc == 1 and 'not found' not in result.stderr
-    retries: 15
-    delay: 5
+    retries: 20
+    delay: 10
+
+
+  - name: "Scale fluentd deployment config"
+    command:  "{{ openshift.common.client_binary }} scale dc/logging-fluentd --replicas={{ fluentd_replicas | default('1') }}"
+
 
   - name: "Scale fluentd replication controller"
-    command: oc scale rc/logging-fluentd-1 --replicas={{ fluentd_replicas | default('1') }}
+    command:  "{{ openshift.common.client_binary }} scale rc/logging-fluentd-1 --replicas={{ fluentd_replicas | default('1') }}"
 
   - debug: msg="Logging components deployed. Note persistant volume for elasticsearch must be setup manually"
 
   - name: Delete temp directory
-  file:
-    name: "{{ mktemp.stdout }}"
-    state: absent
-  changed_when: False
+    file:
+      name: "{{ mktemp.stdout }}"
+      state: absent
+    changed_when: False