From 4cd2b891c7b3b10c789a513349eb29e92d8f9815 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 24 Aug 2016 14:56:18 +0200 Subject: [PATCH] Rework systemd reload handler When daemon reloaded, it disturbs docker. Wait for docker when doing systemctl daemon reload. Do that as well to fix the network_plugin/weave : reload weaveproxy. Also don't do a 10 sec sleep when restarting docker, instead rely on the waiter which checks docker via CLI. Signed-off-by: Bogdan Dobrelya --- roles/docker/handlers/main.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml index 6f54f33d5..4fd8b0269 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/handlers/main.yml @@ -4,10 +4,17 @@ notify: - Docker | reload systemd - Docker | reload docker - - Docker | pause while Docker restarts - Docker | wait for docker +# NOTE(bogdando) reloading systemd daemon disturbs docker, we shall wait for it - name : Docker | reload systemd + command: /bin/true + notify: + - Docker | systemd-daemon-reload + - Docker | wait for docker + when: ansible_service_mgr == "systemd" + +- name : Docker | systemd-daemon-reload shell: systemctl daemon-reload when: ansible_service_mgr == "systemd" @@ -16,9 +23,6 @@ name: docker state: restarted -- name: Docker | pause while Docker restarts - pause: seconds=10 prompt="Waiting for docker restart" - - name: Docker | wait for docker command: /usr/bin/docker images register: docker_ready