From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 13 Nov 2019 11:40:17 +0000 (+0000)
Subject: FIX: Ansible container cleanup
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=cd76618409eee49089d5e6aa7b2ea2e575b562cc

FIX: Ansible container cleanup

Change-Id: I233baca48a3f01d1a206fd004b0503b0f1fad5d9
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---

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..20306100e6 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
@@ -8,10 +8,7 @@
   tags: kill-containers
 
 - name: Kill container - Remove all Docker containers
-  become: yes
-  docker_container:
-    name: "{{ item }}"
-    state: absent
+  shell: "docker rm --force {{ item }}"
   with_items: "{{ running_containers.stdout_lines }}"
   tags: kill-containers
 
@@ -22,9 +19,6 @@
   tags: kill-containers
 
 - name: Kill container - Remove all LXC containers
-  become: yes
-  lxc_container:
-    name: '{{ item }}'
-    state: absent
+  shell: "lxc-destroy --force -n {{ item }}"
   with_items: "{{ running_containers.stdout_lines }}"
   tags: kill-containers