diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-07 09:14:49 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-12-07 09:51:54 -0500 |
| commit | 13ca9bbd624b334cab6a7403764e9bba110fc8b3 (patch) | |
| tree | 7609fbab4c2865bb56454764cca4e1c3380772df /roles/openshift_facts | |
| parent | 4bcb53654635de775c60d0176e3aeeed4856fc86 (diff) | |
| download | openshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.tar.gz openshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.tar.bz2 openshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.tar.xz openshift-13ca9bbd624b334cab6a7403764e9bba110fc8b3.zip | |
Remove all uses of openshift.common.admin_binary
Replace with `oc adm`
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 b371d347c..6a1a08047 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1433,7 +1433,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 @@ -1627,7 +1626,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') |