summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-14 21:01:59 -0500
committerGitHub <noreply@github.com>2016-11-14 21:01:59 -0500
commita8b36bef4f7fc710fa27df96199c8ab71d8ac3d9 (patch)
tree8d0ca999dc3587002fe7f4ca02bdb30a1adcdb66
parentb6fa0f86de23374e8f060e23b2ded0ddbd3eaa1a (diff)
parente790a37d2fdc4e86098b01c50cfa1ef9b702d255 (diff)
downloadopenshift-a8b36bef4f7fc710fa27df96199c8ab71d8ac3d9.tar.gz
openshift-a8b36bef4f7fc710fa27df96199c8ab71d8ac3d9.tar.bz2
openshift-a8b36bef4f7fc710fa27df96199c8ab71d8ac3d9.tar.xz
openshift-a8b36bef4f7fc710fa27df96199c8ab71d8ac3d9.zip
Merge pull request #2677 from EricMountain-1A/fix_docker_fatal_selinux_4upstream-github
Docker daemon is started prematurely.
-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