summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-09-29 12:11:32 -0400
committerSteve Milner <smilner@redhat.com>2017-09-29 12:24:30 -0400
commit54d67ac9905b47ae2fdc0649af25e6d050456256 (patch)
treee0f61730057292f43551adebc008872f314180cb /roles
parent186ded59dc357f39d64cd27f915755b14c34d10f (diff)
downloadopenshift-54d67ac9905b47ae2fdc0649af25e6d050456256.tar.gz
openshift-54d67ac9905b47ae2fdc0649af25e6d050456256.tar.bz2
openshift-54d67ac9905b47ae2fdc0649af25e6d050456256.tar.xz
openshift-54d67ac9905b47ae2fdc0649af25e6d050456256.zip
openshift_node: Set DOCKER_SERVICE for system container
The node system container was being installed with the DOCKER_SERVICE holding to it's manifest.json default of docker.service. This change adds the DOCKER_SERVICE parameter on node system container install so that it uses the same value from the installer stored in openshift.docker.service_name. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1496707 Signed-off-by: Steve Milner <smilner@redhat.com>
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node/tasks/node_system_container.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_node/tasks/node_system_container.yml b/roles/openshift_node/tasks/node_system_container.yml
index 0ca44c292..f9bd43738 100644
--- a/roles/openshift_node/tasks/node_system_container.yml
+++ b/roles/openshift_node/tasks/node_system_container.yml
@@ -11,4 +11,5 @@
image: "{{ 'docker:' if openshift.common.system_images_registry == 'docker' else openshift.common.system_images_registry + '/' }}{{ openshift.node.node_system_image }}:{{ openshift_image_tag }}"
values:
- "DNS_DOMAIN={{ openshift.common.dns_domain }}"
+ - "DOCKER_SERVICE={{ openshift.docker.service_name }}.service"
state: latest