From a9fa654a7260c84a9035a7d0781d99aa85420404 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Tue, 13 Apr 2021 14:01:36 +0200 Subject: [PATCH] [ANSIBLE 3.2.0] Use 'listen' directive for docker handler Using 'import_tasks' for multiple step handler is no longer supported, while 'include_tasks' has some side effects. Change-Id: I61c14c937f80dfcd1780cdc2885ac781be613978 Issue-ID: OOM-2722 Signed-off-by: Bartek Grzybowski --- ansible/roles/docker/handlers/docker_restart.yml | 18 ------------------ ansible/roles/docker/handlers/main.yml | 22 ++++++++++++++++++++-- 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 ansible/roles/docker/handlers/docker_restart.yml diff --git a/ansible/roles/docker/handlers/docker_restart.yml b/ansible/roles/docker/handlers/docker_restart.yml deleted file mode 100644 index 8feb9a95..00000000 --- a/ansible/roles/docker/handlers/docker_restart.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: Stopping docker systemd service - systemd: - name: docker - state: stopped - enabled: true - -# WA for docker bug, see OOM-1735 -- name: Ensure docker.sock cleaned properly - file: - state: absent - path: /var/run/docker.sock - -- name: Starting docker systemd service - systemd: - name: docker - state: started - enabled: true diff --git a/ansible/roles/docker/handlers/main.yml b/ansible/roles/docker/handlers/main.yml index de4a52ac..5bf8619c 100644 --- a/ansible/roles/docker/handlers/main.yml +++ b/ansible/roles/docker/handlers/main.yml @@ -1,3 +1,21 @@ --- -- name: Restart Docker - import_tasks: docker_restart.yml +- name: Stopping docker systemd service + systemd: + name: docker + state: stopped + enabled: true + listen: "Restart Docker" + +# WA for docker bug, see OOM-1735 +- name: Ensure docker.sock cleaned properly + file: + state: absent + path: /var/run/docker.sock + listen: "Restart Docker" + +- name: Starting docker systemd service + systemd: + name: docker + state: started + enabled: true + listen: "Restart Docker" -- 2.16.6