Infra: AWS Update to Ubuntu 20.04

[csit.git] / resources / tools / testbed-setup / ansible / roles / cleanup / tasks / remove_package.yaml

diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/remove_package.yaml b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/remove_package.yaml
index 8f5ec8f..302b43c 100644 (file)
--- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/remove_package.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/remove_package.yaml
@@ -1,31 +1,21 @@
 ---
 # file: roles/cleanup/tasks/remove_package.yaml
 
-- name: Remove package - Fix corrupted apt
-  shell: 'dpkg --configure -a'
-  when: >
-    ansible_distribution == 'Ubuntu'
-  tags: remove-package
+- name: Remove Package - Fix Corrupted APT
+  shell: "dpkg --configure -a"
+  when:
+    - ansible_distribution == 'Ubuntu'
+  tags:
+    - remove-package
 
-- name: Remove package - Check if {{ package }} is installed
-  shell: >
-    "dpkg-query -W -f='${Status}' {{ package }} | grep 'install ok installed'"
-  register: package_is_installed
-  failed_when: no
-  changed_when: no
-  when: >
-    ansible_distribution == 'Ubuntu'
-  tags: remove-package
-
-- name: Remove package - {{ package }}
+- name: Remove Package - {{ package }}
   apt:
-    name: '{{ package }}'
+    name: "{{ package }}"
     force: yes
     purge: yes
-    state: absent
-  when: >
-    package is defined and
-    package != '' and
-    package_is_installed.rc == 0 and
-    ansible_distribution|lower == 'ubuntu'
-  tags: remove-package
+    state: "absent"
+  failed_when: no
+  when:
+    - ansible_distribution == 'Ubuntu'
+  tags:
+    - remove-package