diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-01-30 16:08:35 -0500 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2017-01-31 14:28:38 -0500 |
commit | a4cf9c4119623ad2023aefbe652a424cb567383c (patch) | |
tree | 9389fd080bbcce738bc327fc88077000a92dc3a8 /roles/lib_openshift/library/oc_route.py | |
parent | 494f7e410df1641eb598e81f65153867071d5fee (diff) | |
download | openshift-a4cf9c4119623ad2023aefbe652a424cb567383c.tar.gz openshift-a4cf9c4119623ad2023aefbe652a424cb567383c.tar.bz2 openshift-a4cf9c4119623ad2023aefbe652a424cb567383c.tar.xz openshift-a4cf9c4119623ad2023aefbe652a424cb567383c.zip |
Adding unit test for oc_service. Added environment fix for non-standard oc installs.
Diffstat (limited to 'roles/lib_openshift/library/oc_route.py')
-rw-r--r-- | roles/lib_openshift/library/oc_route.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py index 0419c7bc7..38063886c 100644 --- a/roles/lib_openshift/library/oc_route.py +++ b/roles/lib_openshift/library/oc_route.py @@ -942,11 +942,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) @@ -957,9 +959,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']) |