From 13ca9bbd624b334cab6a7403764e9bba110fc8b3 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 7 Dec 2017 09:14:49 -0500 Subject: Remove all uses of openshift.common.admin_binary Replace with `oc adm` --- roles/openshift_facts/library/openshift_facts.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'roles/openshift_facts/library') 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') -- cgit v1.2.3