summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Mountain <eric.mountain@amadeus.com>2016-10-27 15:03:59 +0200
committerEric Mountain <eric.mountain@amadeus.com>2016-11-14 21:48:12 +0100
commite790a37d2fdc4e86098b01c50cfa1ef9b702d255 (patch)
tree2151fa72c8817bc8f0940fb6fad4672b176b64de
parentae34dc20b9e797d6b73576b30b73931beca693ec (diff)
downloadopenshift-e790a37d2fdc4e86098b01c50cfa1ef9b702d255.tar.gz
openshift-e790a37d2fdc4e86098b01c50cfa1ef9b702d255.tar.bz2
openshift-e790a37d2fdc4e86098b01c50cfa1ef9b702d255.tar.xz
openshift-e790a37d2fdc4e86098b01c50cfa1ef9b702d255.zip
Docker daemon is started prematurely.
Docker service is started prior to configuration changes being applied. The service is then not restarted by the handlers, so configuration changes are not applied. We now start the docker service only once all config changes have been made.
-rw-r--r--roles/docker/tasks/main.yml22
1 files changed, 11 insertions, 11 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 306c649c5..9b7ef0830 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -54,17 +54,6 @@
dest: "{{ docker_systemd_dir }}/custom.conf"
src: custom.conf.j2
-- name: Start the Docker service
- systemd:
- name: docker
- enabled: yes
- state: started
- daemon_reload: yes
- register: start_result
-
-- set_fact:
- docker_service_status_changed: start_result | changed
-
- include: udev_workaround.yml
when: docker_udev_workaround | default(False) | bool
@@ -122,4 +111,15 @@
notify:
- restart docker
+- name: Start the Docker service
+ systemd:
+ name: docker
+ enabled: yes
+ state: started
+ daemon_reload: yes
+ register: start_result
+
+- set_fact:
+ docker_service_status_changed: start_result | changed
+
- meta: flush_handlers