summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-22 15:57:10 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-22 15:57:10 -0400
commit7643bda1cd06a3b1bd57f1fde9b9d72ddde01736 (patch)
treec4784043d2e004513aab6d9682ff69f7ebe67470
parente6d426fddd79c08452195cd32286bb600f62d51d (diff)
parent493dca5935e1706a76231b13a639c40de9a63cdc (diff)
downloadopenshift-7643bda1cd06a3b1bd57f1fde9b9d72ddde01736.tar.gz
openshift-7643bda1cd06a3b1bd57f1fde9b9d72ddde01736.tar.bz2
openshift-7643bda1cd06a3b1bd57f1fde9b9d72ddde01736.tar.xz
openshift-7643bda1cd06a3b1bd57f1fde9b9d72ddde01736.zip
Merge pull request #727 from detiber/fixFacts
Fix error in openshift_facts
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index bd8d96657..3570de693 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -636,7 +636,7 @@ def get_openshift_version():
if os.path.isfile('/usr/bin/openshift'):
_, output, _ = module.run_command(['/usr/bin/openshift', 'version'])
- versions = dict(e.split(' v') for e in output.splitlines())
+ versions = dict(e.split(' v') for e in output.splitlines() if ' v' in e)
version = versions.get('openshift', '')
#TODO: acknowledge the possility of a containerized install