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=ad4fb3768188a12fcd1182d94b3838b3e8bf2e58;hb=refs%2Fchanges%2F05%2F30605%2F1;hp=f5948fb3b3ad2bd946a650b4a5fd4e3611943916;hpb=fb30f887863e9cb15a6224a17b8f8b6a5982d1a2;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 f5948fb3b3..ad4fb37681 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,30 +1,38 @@
 ---
 # 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
-  become: yes
-  docker_container:
-    name: "{{ item }}"
-    state: absent
-  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
-  become: yes
-  lxc_container:
-    name: '{{ item }}'
-    state: absent
-  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