refs #7593 Clean task reorganized

playbooks/clean.yml

@@ -2,22 +2,30 @@
   hosts: all
   gather_facts: no
   tasks:
+
+  - name: Delete old awx-user and it's configuration
+    block:
     - name: Delete awx-user
+      tags: awx
       user:
         name: awx-user
         state: absent
         remove: yes
-    tags: awx
     - name: Delete awx-user sudoers file
+      tags: awx
       file:
         path: /etc/sudoers.d/awx-user
         state: absent
-    tags: awx
+
   - name: Delete old MOTD configuration
+    tags: motd
     file:
       path: /etc/profile.d/mymotd.sh
       state: absent
-    tags: motd
+
+  - name: Delete old profile configuration
+    tags: profile
+    block:
     - name: Delete old Ansible bashrc configuration
       blockinfile:
         path: /root/.bashrc
@@ -25,7 +33,6 @@
         marker_end: 'END ANSIBLE MANAGED BLOCK'
         marker: "# {mark}"
         state: absent
-    tags: bashrc
     - name: Delete old custom bashrc configuration
       replace:
         path: /root/.bashrc
@@ -34,6 +41,7 @@
       vars:
         start_delimiter: '### 4Loo'
         end_delimiter: 'esac'
+
   - name: Delete old vn-host package
     tags: vn-host
     block: