diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-07 13:53:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 13:53:36 -0500 |
| commit | 37ffebc86cd4fe89373542285b40d92f61696270 (patch) | |
| tree | 87ccd2572fd46d9934085bc871ac2705049d04af /roles/openshift_facts | |
| parent | 65cb13e74918d74cb9e8d4854f271a4d35177ad2 (diff) | |
| parent | 13ca9bbd624b334cab6a7403764e9bba110fc8b3 (diff) | |
| download | openshift-37ffebc86cd4fe89373542285b40d92f61696270.tar.gz openshift-37ffebc86cd4fe89373542285b40d92f61696270.tar.bz2 openshift-37ffebc86cd4fe89373542285b40d92f61696270.tar.xz openshift-37ffebc86cd4fe89373542285b40d92f61696270.zip | |
Merge pull request #6380 from sdodson/oc-adm
Remove all uses of openshift.common.admin_binary
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index f57b59085..d2bd7357a 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1410,7 +1410,6 @@ def set_container_facts_if_unset(facts): facts['node']['ovs_system_image'] = ovs_image if safe_get_bool(facts['common']['is_containerized']): - facts['common']['admin_binary'] = '/usr/local/bin/oadm' facts['common']['client_binary'] = '/usr/local/bin/oc' return facts @@ -1595,7 +1594,7 @@ class OpenShiftFacts(object): hostname=hostname, public_hostname=hostname, portal_net='172.30.0.0/16', - client_binary='oc', admin_binary='oadm', + client_binary='oc', dns_domain='cluster.local', config_base='/etc/origin') |