Merge branch 'master' into mbruzek-openshift-openstack

4 files changed, 21 insertions, 14 deletions

diff --git a/roles/openshift_provisioners/meta/main.yaml b/roles/openshift_provisioners/meta/main.yaml
index cb9278eb7..5ef352bcd 100644
--- a/roles/openshift_provisioners/meta/main.yaml
+++ b/roles/openshift_provisioners/meta/main.yaml
@@ -14,3 +14,4 @@ galaxy_info:
 dependencies:
 - role: lib_openshift
 - role: openshift_facts
+- role: lib_utils
diff --git a/roles/openshift_provisioners/tasks/install_efs.yaml b/roles/openshift_provisioners/tasks/install_efs.yaml
index e543d753c..de763f6cf 100644
--- a/roles/openshift_provisioners/tasks/install_efs.yaml
+++ b/roles/openshift_provisioners/tasks/install_efs.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Check efs current replica count
   command: >
-    {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get dc provisioners-efs
+    {{ openshift_client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get dc provisioners-efs
     -o jsonpath='{.spec.replicas}' -n {{openshift_provisioners_project}}
   register: efs_replica_count
   when: not ansible_check_mode
@@ -58,7 +58,7 @@
 # anyuid in order to run as root & chgrp shares with allocated gids
 - name: "Check efs anyuid permissions"
   command: >
-    {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
+    {{ openshift_client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
     get scc/anyuid -o jsonpath='{.users}'
   register: efs_anyuid
   check_mode: no
@@ -66,7 +66,7 @@
 
 - name: "Set anyuid permissions for efs"
   command: >
-    {{ openshift.common.client_binary}} adm --config={{ mktemp.stdout }}/admin.kubeconfig policy
+    {{ openshift_client_binary}} adm --config={{ mktemp.stdout }}/admin.kubeconfig policy
     add-scc-to-user anyuid system:serviceaccount:{{openshift_provisioners_project}}:provisioners-efs
   register: efs_output
   failed_when: efs_output.rc == 1 and 'exists' not in efs_output.stderr
diff --git a/roles/openshift_provisioners/tasks/oc_apply.yaml b/roles/openshift_provisioners/tasks/oc_apply.yaml
index 49d03f203..239e1f1cc 100644
--- a/roles/openshift_provisioners/tasks/oc_apply.yaml
+++ b/roles/openshift_provisioners/tasks/oc_apply.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Checking generation of {{file_content.kind}} {{file_content.metadata.name}}
   command: >
-    {{ openshift.common.client_binary }} --config={{ kubeconfig }}
+    {{ openshift_client_binary }} --config={{ kubeconfig }}
     get {{file_content.kind}} {{file_content.metadata.name}}
     -o jsonpath='{.metadata.resourceVersion}'
     -n {{namespace}}
@@ -11,16 +11,18 @@
 
 - name: Applying {{file_name}}
   command: >
-    {{ openshift.common.client_binary }} --config={{ kubeconfig }}
+    {{ openshift_client_binary }} --config={{ kubeconfig }}
     apply -f {{ file_name }}
     -n {{ namespace }}
   register: generation_apply
-  failed_when: "'error' in generation_apply.stderr"
+  failed_when:
+    - "'error' in generation_apply.stderr"
+    - "generation_apply.rc != 0"
   changed_when: no
 
 - name: Determine change status of {{file_content.kind}} {{file_content.metadata.name}}
   command: >
-    {{ openshift.common.client_binary }} --config={{ kubeconfig }}
+    {{ openshift_client_binary }} --config={{ kubeconfig }}
     get {{file_content.kind}} {{file_content.metadata.name}}
     -o jsonpath='{.metadata.resourceVersion}'
     -n {{namespace}}
@@ -32,20 +34,24 @@
 
 - name: Removing previous {{file_name}}
   command: >
-    {{ openshift.common.client_binary }} --config={{ kubeconfig }}
+    {{ openshift_client_binary }} --config={{ kubeconfig }}
     delete -f {{ file_name }}
     -n {{ namespace }}
   register: generation_delete
-  failed_when: "'error' in generation_delete.stderr"
+  failed_when:
+    - "'error' in generation_delete.stderr"
+    - "generation_delete.rc != 0"
   changed_when: generation_delete.rc == 0
   when: generation_apply.rc != 0
 
 - name: Recreating {{file_name}}
   command: >
-    {{ openshift.common.client_binary }} --config={{ kubeconfig }}
+    {{ openshift_client_binary }} --config={{ kubeconfig }}
     apply -f {{ file_name }}
     -n {{ namespace }}
   register: generation_apply
-  failed_when: "'error' in generation_apply.stderr"
+  failed_when:
+    - "'error' in generation_apply.stderr"
+    - "generation_apply.rc != 0"
   changed_when: generation_apply.rc == 0
   when: generation_apply.rc != 0
diff --git a/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml b/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml
index 602dee773..ac12087ec 100644
--- a/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml
+++ b/roles/openshift_provisioners/tasks/uninstall_provisioners.yaml
@@ -5,7 +5,7 @@
 # delete the deployment objects that we had created
 - name: delete provisioner api objects
   command: >
-    {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
+    {{ openshift_client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
     delete {{ item }} --selector provisioners-infra -n {{ openshift_provisioners_project }} --ignore-not-found=true
   with_items:
     - dc
@@ -15,7 +15,7 @@
 # delete our old secrets
 - name: delete provisioner secrets
   command: >
-    {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
+    {{ openshift_client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
     delete secret {{ item }} -n {{ openshift_provisioners_project }} --ignore-not-found=true
   with_items:
     - provisioners-efs
@@ -26,7 +26,7 @@
 # delete cluster role bindings
 - name: delete cluster role bindings
   command: >
-    {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
+    {{ openshift_client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig
     delete clusterrolebindings {{ item }} -n {{ openshift_provisioners_project }} --ignore-not-found=true
   with_items:
     - run-provisioners-efs