X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fopenwrt%2Fimage%2Ftasks%2Fprepare.yml;h=a3ab7112b6e3b71d35fac6cb204d7d865c5d947c;hb=d67c99352d4d3f36832402effd4afa845cec22e3;hp=b6b67c55ebd9f3de6de70e916380024310a2a7a2;hpb=29fb96f3637ec61bbc45fc00573c6f4d522d3667;p=noc.git

diff --git a/ansible/roles/openwrt/image/tasks/prepare.yml b/ansible/roles/openwrt/image/tasks/prepare.yml
index b6b67c5..a3ab711 100644
--- a/ansible/roles/openwrt/image/tasks/prepare.yml
+++ b/ansible/roles/openwrt/image/tasks/prepare.yml
@@ -1,11 +1,13 @@
 ---
 - name: Create temporary build directory
-  command: mktemp --tmpdir -d openwrt-{{ inventory_hostname }}.XXXXXX
+  tempfile:
+    state: directory
   register: tmpdir
 
-- set_fact:
-    openwrt_imgbuilder_dir:   "{{ tmpdir.stdout }}"
-    openwrt_imgbuilder_files: "{{ tmpdir.stdout }}/files"
+- name: set variables needed to build images
+  set_fact:
+    openwrt_imgbuilder_dir:   "{{ tmpdir.path }}"
+    openwrt_imgbuilder_files: "{{ tmpdir.path }}/files"
 
 - name: Create the directories for mixins
   file:
@@ -18,7 +20,19 @@
     - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}"
 
 
-- name: Copy mixins in place [1/2]
+- name: Copy mixins in place [1/3]
+  file:
+    dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
+    src: "{{ item.value.link }}"
+    force: yes
+    follow: no
+    state: link
+  with_dict: "{{ openwrt_mixin }}"
+  when: '"link" in item.value'
+  loop_control:
+    label: "{{ item.key }}"
+
+- name: Copy mixins in place [2/3]
   copy:
     src: "{{ item.value.file }}"
     dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
@@ -28,7 +42,7 @@
   loop_control:
     label: "{{ item.key }}"
 
-- name: Copy mixins in place [2/2]
+- name: Copy mixins in place [3/3]
   copy:
     content: "{{ item.value.content }}"
     dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}"
@@ -82,7 +96,8 @@
     trim_blocks: yes
   when: openwrt_groups is defined or openwrt_users is defined
 
-- unarchive:
+- name: extract image builder tarball
+  unarchive:
     copy: False
     src:  "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}"
     dest: "{{ openwrt_imgbuilder_dir }}"