summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-03 16:06:16 -0500
committerGitHub <noreply@github.com>2017-05-03 16:06:16 -0500
commit01135c08c46c3674f93123833bc14ba4aa661fe0 (patch)
tree6033f586a27e4b7778bd52540768203bdde7ab1d /roles/openshift_facts/library
parent850bb25200db1488f66c15d9a49cfb8dbc09946a (diff)
parent44115530148069e200e3a5d92b00e981aaa6e824 (diff)
downloadopenshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.gz
openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.bz2
openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.tar.xz
openshift-01135c08c46c3674f93123833bc14ba4aa661fe0.zip
Merge pull request #4049 from ashcrow/system-container-docker
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index ec4014e60..7720136d1 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -59,7 +59,8 @@ def migrate_docker_facts(facts):
'additional_registries',
'insecure_registries',
'blocked_registries',
- 'options'
+ 'options',
+ 'use_system_container',
),
'node': (
'log_driver',
@@ -1792,6 +1793,12 @@ def set_container_facts_if_unset(facts):
deployer_image = 'openshift/origin-deployer'
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 'is_containerized' not in facts['common']:
facts['common']['is_containerized'] = facts['common']['is_atomic']
if 'cli_image' not in facts['common']:
@@ -2074,6 +2081,7 @@ class OpenShiftFacts(object):
hosted_registry_insecure = get_hosted_registry_insecure()
if hosted_registry_insecure is not None:
docker['hosted_registry_insecure'] = hosted_registry_insecure
+ docker['service_name'] = 'docker'
defaults['docker'] = docker
if 'clock' in roles: