replace all with_items with loop

3 files changed, 12 insertions, 12 deletions

diff --git a/roles/openwrt/image/tasks/fetch.yml b/roles/openwrt/image/tasks/fetch.yml
index 66a56572..21bc0c40 100644
--- a/roles/openwrt/image/tasks/fetch.yml
+++ b/roles/openwrt/image/tasks/fetch.yml
@@ -41,13 +41,13 @@
 
   rescue:
     - name: Delete downloaded artifacts
-      file:
-        path: "{{ item }}"
-        state: absent
-      with_items:
+      loop:
         - "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256"
         - "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256.asc"
         - "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
+      file:
+        path: "{{ item }}"
+        state: absent
 
     - name: the download has failed...
       fail:
diff --git a/roles/openwrt/image/tasks/main.yml b/roles/openwrt/image/tasks/main.yml
index 47a8793e..df3592f9 100644
--- a/roles/openwrt/image/tasks/main.yml
+++ b/roles/openwrt/image/tasks/main.yml
@@ -27,7 +27,7 @@
           {% if openwrt_extra_name is defined %} EXTRA_IMAGE_NAME="{{ openwrt_extra_name }}" {% endif %}
 
     - name: Copy newly built OpenWrt image
-      with_items: "{{ openwrt_output_image_suffixes }}"
+      loop: "{{ openwrt_output_image_suffixes }}"
       copy:
         src: "{{ openwrt_imgbuilder_dir }}/{{ openwrt_tarball_basename }}/bin/targets/{{ openwrt_arch }}/{{ openwrt_target }}/{{ openwrt_output_image_name_base }}-{{ item }}"
         dest: "{{ openwrt_output_dir }}"
diff --git a/roles/openwrt/image/tasks/prepare.yml b/roles/openwrt/image/tasks/prepare.yml
index a3ab7112..ffac3c3f 100644
--- a/roles/openwrt/image/tasks/prepare.yml
+++ b/roles/openwrt/image/tasks/prepare.yml
@@ -10,14 +10,14 @@
     openwrt_imgbuilder_files: "{{ tmpdir.path }}/files"
 
 - name: Create the directories for mixins
+  loop:
+    - "{{ openwrt_download_dir }}/dl/{{ openwrt_arch }}"
+    - "{{ openwrt_imgbuilder_files }}/etc/config"
+    - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}"
   file:
     path: "{{ item }}"
     state: directory
     mode: '0755'
-  with_items:
-    - "{{ openwrt_download_dir }}/dl/{{ openwrt_arch }}"
-    - "{{ openwrt_imgbuilder_files }}/etc/config"
-    - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}"
 
 
 - name: Copy mixins in place [1/3]
@@ -53,6 +53,9 @@
     label: "{{ item.key }}"
 
 - name: Generate /etc/fstab
+  loop: "{{ openwrt_mounts }}"
+  loop_control:
+    label: "{{ item.path }}"
   mount:
     fstab: "{{ openwrt_imgbuilder_files }}/etc/fstab"
     state: present
@@ -64,9 +67,6 @@
     dump: "{{ item.dump | default(omit) }}"
     passno: "{{ item.passno | default(omit) }}"
   when: openwrt_mounts is defined
-  with_items: "{{ openwrt_mounts }}"
-  loop_control:
-    label: "{{ item.path }}"
 
 
 - name: Create UCI configuration files