Browse Source

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

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1463131

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Giuseppe Scrivano 7 years ago
parent
commit
8613dad4e5
1 changed files with 3 additions and 3 deletions
  1. 3 3
      roles/openshift_hosted/tasks/router/router.yml

+ 3 - 3
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 }'