summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-01-19 16:32:54 -0500
committerAndrew Butcher <abutcher@redhat.com>2016-01-19 16:32:54 -0500
commite3a406f47cb32bb9fb858ac56cb63951a3573742 (patch)
tree1b39e7438b70a14f30c9df5b60203d8dddb0724d
parent8ce35b40a55f46f716f280054594c8b5d39cd547 (diff)
downloadopenshift-e3a406f47cb32bb9fb858ac56cb63951a3573742.tar.gz
openshift-e3a406f47cb32bb9fb858ac56cb63951a3573742.tar.bz2
openshift-e3a406f47cb32bb9fb858ac56cb63951a3573742.tar.xz
openshift-e3a406f47cb32bb9fb858ac56cb63951a3573742.zip
Fix wrapper pathing for non-root user install.
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 831d78b83..8216be7b2 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1031,6 +1031,10 @@ def set_container_facts_if_unset(facts):
if 'ovs_image' not in facts['node']:
facts['node']['ovs_image'] = ovs_image
+ if facts['common']['is_containerized']:
+ facts['common']['admin_binary'] = '/usr/local/bin/oadm'
+ facts['common']['client_binary'] = '/usr/local/bin/oc'
+
return facts