summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-15 10:24:00 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-15 10:24:00 -0300
commitb26b6f8c5bd0767495ee3d256f0772e769029923 (patch)
treeb533231cdb0dc4b1ba756366fdc2912e776b08f5
parenta836a35b63ff1476eca5a8545a6c11ab389026d0 (diff)
downloadopenshift-b26b6f8c5bd0767495ee3d256f0772e769029923.tar.gz
openshift-b26b6f8c5bd0767495ee3d256f0772e769029923.tar.bz2
openshift-b26b6f8c5bd0767495ee3d256f0772e769029923.tar.xz
openshift-b26b6f8c5bd0767495ee3d256f0772e769029923.zip
Fix performance hit in openshift_facts.
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 9d7705af7..97cca2e5c 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1133,11 +1133,6 @@ def get_openshift_version(facts):
if os.path.isfile('/usr/bin/openshift'):
_, output, _ = module.run_command(['/usr/bin/openshift', 'version'])
version = parse_openshift_version(output)
- elif os.path.isfile('/usr/local/bin/openshift'):
- # TODO: this should probably make sure the actual image is already present, this can take awhile if it has to pull
- # and is falsely acting like openshift is already installed
- _, output, _ = module.run_command(['/usr/local/bin/openshift', 'version'])
- version = parse_openshift_version(output)
elif 'node' in facts and 'common' in facts and 'is_containerized' in facts['common']:
version = get_containerized_node_openshift_version(facts)