From b26b6f8c5bd0767495ee3d256f0772e769029923 Mon Sep 17 00:00:00 2001 From: Devan Goodwin Date: Wed, 15 Jun 2016 10:24:00 -0300 Subject: Fix performance hit in openshift_facts. --- roles/openshift_facts/library/openshift_facts.py | 5 ----- 1 file changed, 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) -- cgit v1.2.3