summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-05 12:40:33 -0500
committerGitHub <noreply@github.com>2017-05-05 12:40:33 -0500
commitbc5eb65f9bcd4147130e062ef2e4499145811c90 (patch)
tree77c84ff9cfde394a06188b6728f54da9c1ed6658 /roles/openshift_facts
parent37d759f17a772b9ddf1e6b49c023dca6fc79d801 (diff)
parente360372dcaf78648a329ce16f9d0365eed6636c8 (diff)
downloadopenshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.tar.gz
openshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.tar.bz2
openshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.tar.xz
openshift-bc5eb65f9bcd4147130e062ef2e4499145811c90.zip
Merge pull request #4103 from ganhuang/fix_container_engine
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_facts')
-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']