diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-20 08:18:51 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-01-20 08:18:51 -0500 |
| commit | 9712e8250ddc5088b9f33d5349fcab6308adf459 (patch) | |
| tree | 2220c7f63ca955dd20af8a4f66d73e316ef31f24 /roles/openshift_facts | |
| parent | 56d41c5dc8a80e53d934df159a58b91be975e3b0 (diff) | |
| parent | e3a406f47cb32bb9fb858ac56cb63951a3573742 (diff) | |
| download | openshift-9712e8250ddc5088b9f33d5349fcab6308adf459.tar.gz openshift-9712e8250ddc5088b9f33d5349fcab6308adf459.tar.bz2 openshift-9712e8250ddc5088b9f33d5349fcab6308adf459.tar.xz openshift-9712e8250ddc5088b9f33d5349fcab6308adf459.zip | |
Merge pull request #1240 from abutcher/wrapper-pathing
Fix client and admin wrapper pathing for non-root user install.
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
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 0820989af..af819e218 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1047,6 +1047,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 |