summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-11-29 10:39:42 -0500
committerGitHub <noreply@github.com>2016-11-29 10:39:42 -0500
commit4c2a6db2b968abdf7ab641340700856ff179e8e3 (patch)
tree1e1f99b1a04e7b95f14c20ea3333b74d8cfc4b9d /roles/docker
parent244132714dac209ebebe9141a58da5d2e9f1bb13 (diff)
parentec9c22ca6a376b7d1139a384dcb78f3f5bb5b607 (diff)
downloadopenshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.tar.gz
openshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.tar.bz2
openshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.tar.xz
openshift-4c2a6db2b968abdf7ab641340700856ff179e8e3.zip
Merge pull request #2868 from mtnbikenc/systemd-refactor
Refactored to use Ansible systemd module
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/handlers/main.yml5
-rw-r--r--roles/docker/tasks/udev_workaround.yml8
2 files changed, 4 insertions, 9 deletions
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
index aff905bc8..9ccb306fc 100644
--- a/roles/docker/handlers/main.yml
+++ b/roles/docker/handlers/main.yml
@@ -1,12 +1,13 @@
---
- name: restart docker
- service:
+ systemd:
name: docker
state: restarted
when: not docker_service_status_changed | default(false) | bool
- name: restart udev
- service:
+ systemd:
name: systemd-udevd
state: restarted
+ daemon_reload: yes
diff --git a/roles/docker/tasks/udev_workaround.yml b/roles/docker/tasks/udev_workaround.yml
index aa7af0cb3..257c3123d 100644
--- a/roles/docker/tasks/udev_workaround.yml
+++ b/roles/docker/tasks/udev_workaround.yml
@@ -21,10 +21,4 @@
owner: root
mode: "0644"
notify:
- - restart udev
- register: udevw_override_conf
-
-- name: reload systemd config files
- command: systemctl daemon-reload
- when: udevw_override_conf | changed
-
+ - restart udev