Browse Source

Merge pull request #2677 from EricMountain-1A/fix_docker_fatal_selinux_4upstream-github

Docker daemon is started prematurely.
Scott Dodson 8 years ago
parent
commit
a8b36bef4f
1 changed files with 11 additions and 11 deletions
  1. 11 11
      roles/docker/tasks/main.yml

+ 11 - 11
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