diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-06-26 18:49:30 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-06-26 23:48:21 +0200 |
| commit | 8613dad4e5e64b46d0655f43f1d472277803db06 (patch) | |
| tree | 3bc3e6d495515ab95ebc804816747f342a2b4edc | |
| parent | 7b0acaff56fe08e4d302a86ed4b00db6739f16a9 (diff) | |
| download | openshift-8613dad4e5e64b46d0655f43f1d472277803db06.tar.gz openshift-8613dad4e5e64b46d0655f43f1d472277803db06.tar.bz2 openshift-8613dad4e5e64b46d0655f43f1d472277803db06.tar.xz openshift-8613dad4e5e64b46d0655f43f1d472277803db06.zip | |
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>
| -rw-r--r-- | roles/openshift_hosted/tasks/router/router.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml index 160ae2f5e..c60b67862 100644 --- a/roles/openshift_hosted/tasks/router/router.yml +++ b/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 }' |