diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-12-06 19:21:12 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-12-06 19:21:12 +0100 |
| commit | a64c677e603dd3f6fdb57d89b65ccc5cd967e20c (patch) | |
| tree | 6415424d024d21212f1a896538eca44fe7efa5a8 /roles/openwrt/image/tasks/prepare.yml | |
| parent | cleanup ch-testvm* and make common playbook work in any case (diff) | |
upgrade accesspoints
Diffstat (limited to 'roles/openwrt/image/tasks/prepare.yml')
| -rw-r--r-- | roles/openwrt/image/tasks/prepare.yml | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/roles/openwrt/image/tasks/prepare.yml b/roles/openwrt/image/tasks/prepare.yml index 339d3fdd..4b7cda7a 100644 --- a/roles/openwrt/image/tasks/prepare.yml +++ b/roles/openwrt/image/tasks/prepare.yml @@ -23,7 +23,7 @@ - name: Copy mixins in place [1/3] - loop: "{{ openwrt_mixin | dict2items }}" + loop: "{{ openwrt_mixin | dict2items | selectattr('value.link', 'defined') | list }}" loop_control: label: "{{ item.key }}" file: @@ -32,29 +32,27 @@ force: yes follow: no state: link - when: '"link" in item.value' - name: Copy mixins in place [2/3] - loop: "{{ openwrt_mixin | dict2items }}" + loop: "{{ openwrt_mixin | dict2items | selectattr('value.file', 'defined') | list }}" loop_control: label: "{{ item.key }}" copy: src: "{{ item.value.file }}" dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}" mode: "{{ item.value.mode | default('0644') }}" - when: '"file" in item.value' - name: Copy mixins in place [3/3] - loop: "{{ openwrt_mixin | dict2items }}" + loop: "{{ openwrt_mixin | dict2items | selectattr('value.content', 'defined') | list }}" loop_control: label: "{{ item.key }}" copy: content: "{{ item.value.content }}" dest: "{{ openwrt_imgbuilder_files }}/{{ item.key }}" mode: "{{ item.value.mode | default('0644') }}" - when: '"content" in item.value' - name: Generate /etc/fstab + when: openwrt_mounts is defined loop: "{{ openwrt_mounts }}" loop_control: label: "{{ item.path }}" @@ -68,7 +66,6 @@ boot: "{{ item.boot | default(omit) }}" dump: "{{ item.dump | default(omit) }}" passno: "{{ item.passno | default(omit) }}" - when: openwrt_mounts is defined - name: Create UCI configuration files @@ -83,20 +80,20 @@ # force: no ## TODO: fail when overwriting a file - name: Create /etc/passwd + when: openwrt_users is defined template: src: passwd.j2 dest: "{{ openwrt_imgbuilder_files }}/etc/passwd" mode: 0644 trim_blocks: yes - when: openwrt_users is defined - name: Create /etc/group + when: openwrt_groups is defined or openwrt_users is defined template: src: group.j2 dest: "{{ openwrt_imgbuilder_files }}/etc/group" mode: 0644 trim_blocks: yes - when: openwrt_groups is defined or openwrt_users is defined - name: extract image builder tarball unarchive: |