From e790a37d2fdc4e86098b01c50cfa1ef9b702d255 Mon Sep 17 00:00:00 2001
From: Eric Mountain <eric.mountain@amadeus.com>
Date: Thu, 27 Oct 2016 15:03:59 +0200
Subject: 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.
---
 roles/docker/tasks/main.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'roles')

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
-- 
cgit v1.2.3