Explorar o código

Merge pull request #1240 from abutcher/wrapper-pathing

Fix client and admin wrapper pathing for non-root user install.
Brenton Leanhardt %!s(int64=9) %!d(string=hai) anos
pai
achega
9712e8250d
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      roles/openshift_facts/library/openshift_facts.py

+ 4 - 0
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