summaryrefslogtreecommitdiffstats
path: root/roles/openshift_hosted
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-06-27 09:08:34 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-06-27 09:08:34 +0200
commit50cb68ca2892aa04d741e019d69e4c8bc1556951 (patch)
treeaca818569e56a394e4d3560d95aaa3f84d641f47 /roles/openshift_hosted
parent8613dad4e5e64b46d0655f43f1d472277803db06 (diff)
downloadopenshift-50cb68ca2892aa04d741e019d69e4c8bc1556951.tar.gz
openshift-50cb68ca2892aa04d741e019d69e4c8bc1556951.tar.bz2
openshift-50cb68ca2892aa04d741e019d69e4c8bc1556951.tar.xz
openshift-50cb68ca2892aa04d741e019d69e4c8bc1556951.zip
registry: look for the oc executable in /usr/local/bin and ~/bin
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/openshift_hosted')
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index d895e9a68..2eeb2e7ce 100644
--- a/roles/openshift_hosted/tasks/registry/registry.yml
+++ b/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 }'