summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorGan Huang <ghuang@redhat.com>2017-05-05 18:18:41 +0800
committerGan Huang <ghuang@redhat.com>2017-05-05 22:39:54 +0800
commite360372dcaf78648a329ce16f9d0365eed6636c8 (patch)
tree1573e487e707dbaeb4ddeca031376dfb81a3d310 /roles/openshift_facts/library
parentf7993afb2fec58b7bd13a70d812bf60deb5b1402 (diff)
downloadopenshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.gz
openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.bz2
openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.tar.xz
openshift-e360372dcaf78648a329ce16f9d0365eed6636c8.zip
Fix 1448368, and some other minors issues
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 7720136d1..5ea902e2b 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -59,8 +59,7 @@ def migrate_docker_facts(facts):
'additional_registries',
'insecure_registries',
'blocked_registries',
- 'options',
- 'use_system_container',
+ 'options'
),
'node': (
'log_driver',
@@ -1795,9 +1794,9 @@ def set_container_facts_if_unset(facts):
facts['common']['is_atomic'] = os.path.isfile('/run/ostree-booted')
# If openshift_docker_use_system_container is set and is True ....
if 'use_system_container' in list(facts['docker'].keys()):
- if facts['docker']['use_system_container'] is True:
- # ... set the service name to container-engine-docker
- facts['docker']['service_name'] = 'container-engine-docker'
+ if facts['docker']['use_system_container']:
+ # ... set the service name to container-engine
+ facts['docker']['service_name'] = 'container-engine'
if 'is_containerized' not in facts['common']:
facts['common']['is_containerized'] = facts['common']['is_atomic']