fixed renaming of gnocci host_vars directories

[noc.git] / ansible / roles / openwrt-image / tasks / prepare.yml

diff --git a/ansible/roles/openwrt-image/tasks/prepare.yml b/ansible/roles/openwrt-image/tasks/prepare.yml
index b0847ec..b6b67c5 100644 (file)
--- a/ansible/roles/openwrt-image/tasks/prepare.yml
+++ b/ansible/roles/openwrt-image/tasks/prepare.yml
@@ -13,7 +13,7 @@
     state: directory
     mode: '0755'
   with_items:
-    - "{{ openwrt_download_dir }}/dl"
+    - "{{ openwrt_download_dir }}/dl/{{ openwrt_arch }}"
     - "{{ openwrt_imgbuilder_files }}/etc/config"
     - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}"
 
@@ -42,13 +42,19 @@
   mount:
     fstab: "{{ openwrt_imgbuilder_files }}/etc/fstab"
     state: present
-  args:
-    "{{ item }}"
+    src: "{{ item.src | default(omit) }}"
+    path: "{{ item.path | default(omit) }}"
+    fstype: "{{ item.fstype | default(omit) }}"
+    opts: "{{ item.opts | default(omit) }}"
+    boot: "{{ item.boot | default(omit) }}"
+    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
   template:
     src: uci.j2
@@ -76,19 +82,13 @@
     trim_blocks: yes
   when: openwrt_groups is defined or openwrt_users is defined
 
-### TODO: this just hangs?
-# - unarchive:
-#     copy: False
-#     src:  "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
-#     dest: "{{ openwrt_imgbuilder_dir }}"
-
-- name: Decompress the OpenWrt image builder
-  command: >-
-    tar -xf  "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
-    -C   "{{ openwrt_imgbuilder_dir     }}"
+- unarchive:
+    copy: False
+    src:  "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
+    dest: "{{ openwrt_imgbuilder_dir }}"
 
 - name: Symlink the cache repository
   file:
     state: link
-    src: "{{ playbook_dir }}/{{ openwrt_download_dir }}/dl"
+    src: "{{ openwrt_download_dir }}/dl/{{ openwrt_arch }}"
     path: "{{ openwrt_imgbuilder_dir }}/{{ openwrt_tarball_basename }}/dl"