Bundle all actions with same condition

Author: Michael Vasseur

provision-contest/ansible/roles/system_fixes/tasks/main.yml

@@ -43,27 +43,27 @@
   notify: Update dconf
   when: GRAPHICAL
 
-- name: Configure static IP address
-  template:
-    src: static_ip.j2
-    dest: /etc/network/interfaces.d/{{ STATIC_IP_INTERFACE }}
-  notify: Reboot the machine
+- name: Configure network for static IP address
   when: STATIC_IP_ENABLED
+  block:
+    - name: Configure static IP address
+      template:
+        src: static_ip.j2
+        dest: /etc/network/interfaces.d/{{ STATIC_IP_INTERFACE }}
+      notify: Reboot the machine
 
-- name: Load configuration from /etc/network/interfaces.d
-  lineinfile:
-    path: /etc/network/interfaces
-    line: 'source-directory /etc/network/interfaces.d'
-  notify: Reboot the machine
-  when: STATIC_IP_ENABLED
+    - name: Load configuration from /etc/network/interfaces.d
+      lineinfile:
+        path: /etc/network/interfaces
+        line: 'source-directory /etc/network/interfaces.d'
+      notify: Reboot the machine
 
-- name: Use 8.8.8.8 as DNS server
-  lineinfile:
-    path: /etc/systemd/resolved.conf
-    regexp: '^#?DNS='
-    line: 'DNS=8.8.8.8'
-  notify: Reboot the machine
-  when: STATIC_IP_ENABLED
+    - name: Use 8.8.8.8 as DNS server
+      lineinfile:
+        path: /etc/systemd/resolved.conf
+        regexp: '^#?DNS='
+        line: 'DNS=8.8.8.8'
+      notify: Reboot the machine
 
 - name: Flush handlers
   meta: flush_handlers