diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-02-01 15:57:36 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-01 15:57:36 -0600 |
commit | 3e7787fc86c997679eb14e1a936336086177b438 (patch) | |
tree | 51297cfb566d0e1f2e9623cca209ac7aa360b97e /roles/lib_openshift/library/oc_obj.py | |
parent | f6c5d4ca41da66b933b600ae5a871624db92a68e (diff) | |
parent | c9480811d2222693abe4460ca42c292b289a0ef4 (diff) | |
download | openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.gz openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.bz2 openshift-3e7787fc86c997679eb14e1a936336086177b438.tar.xz openshift-3e7787fc86c997679eb14e1a936336086177b438.zip |
Merge branch 'master' into logging_fix_immutable_spec_changes
Diffstat (limited to 'roles/lib_openshift/library/oc_obj.py')
-rw-r--r-- | roles/lib_openshift/library/oc_obj.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/lib_openshift/library/oc_obj.py b/roles/lib_openshift/library/oc_obj.py index 88880223d..9fd16c03a 100644 --- a/roles/lib_openshift/library/oc_obj.py +++ b/roles/lib_openshift/library/oc_obj.py @@ -917,11 +917,13 @@ class OpenShiftCLI(object): def _run(self, cmds, input_data): ''' Actually executes the command. This makes mocking easier. ''' + curr_env = os.environ.copy() + curr_env.update({'KUBECONFIG': self.kubeconfig}) proc = subprocess.Popen(cmds, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, - env={'KUBECONFIG': self.kubeconfig}) + env=curr_env) stdout, stderr = proc.communicate(input_data) @@ -932,9 +934,9 @@ class OpenShiftCLI(object): '''Base command for oc ''' cmds = [] if oadm: - cmds = ['/usr/bin/oadm'] + cmds = ['oadm'] else: - cmds = ['/usr/bin/oc'] + cmds = ['oc'] if self.all_namespaces: cmds.extend(['--all-namespaces']) |