X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Ftestbed-setup%2Fansible%2Froles%2Fcleanup%2Ftasks%2Fkill_containers.yaml;h=25fd48e420dc25e14cbf19f9485bc2b5349c5f9d;hb=8018da98e0f362bc69fc9600fac222a86fd46b5e;hp=20306100e67ac511a696c34c350a5cf18bf4c4b1;hpb=cd76618409eee49089d5e6aa7b2ea2e575b562cc;p=csit.git

diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_containers.yaml b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_containers.yaml
index 20306100e6..25fd48e420 100644
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_containers.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/kill_containers.yaml
@@ -1,24 +1,42 @@
 ---
 # file: roles/cleanup/tasks/kill_containers.yaml
 
-- name: Kill container - Get running Docker containers
-  shell: "docker ps -aq"
-  register: running_containers
-  changed_when: no
-  tags: kill-containers
+- name: Kill Docker Containers
+  block:
+  - name: Kill Container - Get Running Docker Containers
+    shell: "docker ps -aq"
+    register: running_containers
+    changed_when: no
+    tags:
+      - kill-containers
 
-- name: Kill container - Remove all Docker containers
-  shell: "docker rm --force {{ item }}"
-  with_items: "{{ running_containers.stdout_lines }}"
-  tags: kill-containers
+  - name: Kill Container - Remove All Docker Containers
+    shell: "docker rm --force {{ item }}"
+    with_items: "{{ running_containers.stdout_lines }}"
+    tags:
+      - kill-containers
 
-- name: Kill container - Get running LXC containers
-  shell: "lxc-ls"
-  register: running_containers
-  changed_when: no
-  tags: kill-containers
+  rescue:
+  - name: Restart Docker Daemon
+    systemd:
+      name: "docker"
+      state: "restarted"
 
-- name: Kill container - Remove all LXC containers
-  shell: "lxc-destroy --force -n {{ item }}"
-  with_items: "{{ running_containers.stdout_lines }}"
-  tags: kill-containers
+- name: Kill LXC Containers
+  block:
+  - name: Kill Container - Get Running LXC Containers
+    shell: "lxc-ls"
+    register: running_containers
+    changed_when: no
+    tags:
+      - kill-containers
+
+  - name: Kill Container - Remove All LXC Containers
+    shell: "lxc-destroy --force -n {{ item }}"
+    with_items: "{{ running_containers.stdout_lines }}"
+    tags:
+      - kill-containers
+
+  rescue:
+  - fail:
+      msg: "Kill LXC containers failed!"
\ No newline at end of file