Refactor: Join tasks into blocks to factor out conditions

[ansible.git] / playbooks / debian / roles / root / tasks / mc.yml

diff --git a/playbooks/debian/roles/root/tasks/mc.yml b/playbooks/debian/roles/root/tasks/mc.yml
index 332015ef7d3facd2480290e9d892eaca816480ac..c27e80e99d076681ad6c51e1e000b178063a7a3b 100644 (file)
--- a/playbooks/debian/roles/root/tasks/mc.yml
+++ b/playbooks/debian/roles/root/tasks/mc.yml
@@ -10,41 +10,39 @@
     msg: "mc links have already been created"
   when: links_exist.results|selectattr('stat.exists')|selectattr('stat.islnk')|list|length == 3
 
-- name: "Setup root mc - create directories for mc links"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: directory
-    mode: "0700"
-  loop: ['.cache', '.config', '.local/share']
-  when: links_exist.results|selectattr('stat.exists')|selectattr('stat.islnk')|list|length != 3
+- block:
+    - name: "Setup root mc - create directories for mc links"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: directory
+        mode: "0700"
+      loop: ['.cache', '.config', '.local/share']
 
-- name: "Setup root mc - remove mc directories"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: absent
-  loop: ['.cache/mc', '.config/mc', '.local/share/mc']
-  when: links_exist.results|selectattr('stat.exists')|selectattr('stat.islnk')|list|length != 3
+    - name: "Setup root mc - remove mc directories"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: absent
+      loop: ['.cache/mc', '.config/mc', '.local/share/mc']
 
-- name: "Setup root mc - link mc directories (1)"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: link
-    src: "../.mc"
-    force: yes
-  loop: ['.cache/mc', '.config/mc']
-  when: links_exist.results|selectattr('stat.exists')|selectattr('stat.islnk')|list|length != 3
+    - name: "Setup root mc - link mc directories (1)"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: link
+        src: "../.mc"
+        force: yes
+      loop: ['.cache/mc', '.config/mc']
 
-- name: "Setup root mc - link mc directories (2)"
-  become: true
-  file:
-    path: "~root/{{ item }}"
-    state: link
-    src: "../../.mc"
-    force: yes
-  loop: ['.local/share/mc']
+    - name: "Setup root mc - link mc directories (2)"
+      become: true
+      file:
+        path: "~root/{{ item }}"
+        state: link
+        src: "../../.mc"
+        force: yes
+      loop: ['.local/share/mc']
   when: links_exist.results|selectattr('stat.exists')|selectattr('stat.islnk')|list|length != 3
 
 - name: "Setup root mc - overwrite files from ~phd/admin"