summaryrefslogtreecommitdiffstats
path: root/roles/flannel/handlers
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-04-24 16:28:37 -0400
committerSteve Milner <smilner@redhat.com>2017-05-03 09:22:17 -0400
commit44115530148069e200e3a5d92b00e981aaa6e824 (patch)
treed2b30e5d22f58f1e9802b2f8ad7ae2a253b608d4 /roles/flannel/handlers
parentba5c6594ade6679d055aaecc7c38836444f0f791 (diff)
downloadopenshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.gz
openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.bz2
openshift-44115530148069e200e3a5d92b00e981aaa6e824.tar.xz
openshift-44115530148069e200e3a5d92b00e981aaa6e824.zip
System container docker
This change allows for the use of either the traditional package install of docker OR a system container install of docker. Two new inventory options, openshift_docker_use_system_container and openshift_docker_systemcontainer_image_registry_override, have been added which are be used to install with a system container. By default this option is commented out. One new fact has been added: - docker.service_name: docker by default, container-engine-docker for system container
Diffstat (limited to 'roles/flannel/handlers')
-rw-r--r--roles/flannel/handlers/main.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/flannel/handlers/main.yml b/roles/flannel/handlers/main.yml
index 94d1d18fb..c60c2115a 100644
--- a/roles/flannel/handlers/main.yml
+++ b/roles/flannel/handlers/main.yml
@@ -5,4 +5,6 @@
- name: restart docker
become: yes
- systemd: name=docker state=restarted
+ systemd:
+ name: "{{ openshift.docker.service_name }}"
+ state: restarted