Merge pull request #4588 from giuseppe/router-look-for-oc

router/registry: look for the oc executable in /usr/local/bin and ~/bin

roles/openshift_hosted/tasks/registry/registry.yml

@@ -135,7 +135,7 @@
 
 - name: Determine the latest version of the OpenShift registry deployment
   command: |
-    oc get deploymentconfig {{ openshift_hosted_registry_name }} \
+    {{ openshift.common.client_binary }} get deploymentconfig {{ openshift_hosted_registry_name }} \
            --namespace {{ openshift_hosted_registry_namespace }} \
            --config {{ openshift.common.config_base }}/master/admin.kubeconfig \
            -o jsonpath='{ .status.latestVersion }'
@@ -143,7 +143,7 @@
 
 - name: Sanity-check that the OpenShift registry rolled out correctly
   command: |
-    oc get replicationcontroller {{ openshift_hosted_registry_name }}-{{ openshift_hosted_registry_latest_version.stdout }} \
+    {{ openshift.common.client_binary }} get replicationcontroller {{ openshift_hosted_registry_name }}-{{ openshift_hosted_registry_latest_version.stdout }} \
            --namespace {{ openshift_hosted_registry_namespace }} \
            --config {{ openshift.common.config_base }}/master/admin.kubeconfig \
            -o jsonpath='{ .metadata.annotations.openshift\.io/deployment\.phase }'

roles/openshift_hosted/tasks/router/router.yml

@@ -92,7 +92,7 @@
 
 - name: Ensure OpenShift router correctly rolls out (best-effort today)
   command: |
-    oc rollout status deploymentconfig {{ item.name }} \
+    {{ openshift.common.client_binary }} rollout status deploymentconfig {{ item.name }} \
                       --namespace {{ item.namespace | default('default') }} \
                       --config {{ openshift.common.config_base }}/master/admin.kubeconfig
   async: 600
@@ -102,7 +102,7 @@
 
 - name: Determine the latest version of the OpenShift router deployment
   command: |
-    oc get deploymentconfig {{ item.name }} \
+    {{ openshift.common.client_binary }} get deploymentconfig {{ item.name }} \
            --namespace {{ item.namespace }} \
            --config {{ openshift.common.config_base }}/master/admin.kubeconfig \
            -o jsonpath='{ .status.latestVersion }'
@@ -111,7 +111,7 @@
 
 - name: Poll for OpenShift router deployment success
   command: |
-    oc get replicationcontroller {{ item.0.name }}-{{ item.1.stdout }} \
+    {{ openshift.common.client_binary }} get replicationcontroller {{ item.0.name }}-{{ item.1.stdout }} \
            --namespace {{ item.0.namespace }} \
            --config {{ openshift.common.config_base }}/master/admin.kubeconfig \
            -o jsonpath='{ .metadata.annotations.openshift\.io/deployment\.phase }'