summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2016-03-14 10:17:44 -0400
committerAndrew Butcher <abutcher@redhat.com>2016-03-14 10:17:44 -0400
commit728dde0f940170588f8edd90c132b3f36b8efc86 (patch)
tree0ce8787141d0c53cfa582946933b839504768ce7 /roles/openshift_facts
parent7415f01e92f751a802db6a555dd02a56c01f590e (diff)
downloadopenshift-728dde0f940170588f8edd90c132b3f36b8efc86.tar.gz
openshift-728dde0f940170588f8edd90c132b3f36b8efc86.tar.bz2
openshift-728dde0f940170588f8edd90c132b3f36b8efc86.tar.xz
openshift-728dde0f940170588f8edd90c132b3f36b8efc86.zip
Ensure is_containerized is cast as bool.
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 98e20288b..eb3a89035 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -904,7 +904,7 @@ def get_openshift_version(facts, cli_image=None):
_, output, _ = module.run_command(['/usr/bin/openshift', 'version'])
version = parse_openshift_version(output)
- if 'is_containerized' in facts['common'] and facts['common']['is_containerized']:
+ if 'is_containerized' in facts['common'] and safe_get_bool(facts['common']['is_containerized']):
container = None
if 'master' in facts:
if 'cluster_method' in facts['master']:
@@ -1288,7 +1288,7 @@ class OpenShiftFacts(object):
facts = set_aggregate_facts(facts)
facts = set_etcd_facts_if_unset(facts)
facts = set_container_facts_if_unset(facts)
- if not facts['common']['is_containerized']:
+ if not safe_get_bool(facts['common']['is_containerized']):
facts = set_installed_variant_rpm_facts(facts)
return dict(openshift=facts)