summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-09 12:48:40 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-10 10:42:04 -0300
commitbcf414e8b559d35909f26420d9e7dec3cd0a1897 (patch)
treeef89779f1deaff5c19d10c6d8addca9e427c1530 /roles
parent00eb0c79ed65543b3d358ae71b1a40fcbc88d78b (diff)
downloadopenshift-bcf414e8b559d35909f26420d9e7dec3cd0a1897.tar.gz
openshift-bcf414e8b559d35909f26420d9e7dec3cd0a1897.tar.bz2
openshift-bcf414e8b559d35909f26420d9e7dec3cd0a1897.tar.xz
openshift-bcf414e8b559d35909f26420d9e7dec3cd0a1897.zip
Fix missing openshift.common.version fact on containerized nodes.
Diffstat (limited to 'roles')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 8824a663c..856dcbdb8 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1138,6 +1138,9 @@ def get_openshift_version(facts):
# 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']:
+ _, output, _ = module.run_command(['docker', 'run', '--rm', facts['common']['cli_image'], 'version'])
+ version = parse_openshift_version(output)
return version