diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-12-25 11:42:44 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-12-25 11:42:44 +0100 |
| commit | db08ebcbdb59124e0e2e78a7dff5033d4e3238fc (patch) | |
| tree | 8108404c64fb6f99a727cb0a12dfee5a8bbe2f89 /roles/openwrt/image | |
| parent | added openwrt role and config for elevate router (diff) | |
some linter fixes
Diffstat (limited to 'roles/openwrt/image')
| -rw-r--r-- | roles/openwrt/image/tasks/fetch.yml | 4 | ||||
| -rw-r--r-- | roles/openwrt/image/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/openwrt/image/tasks/prepare.yml | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/roles/openwrt/image/tasks/fetch.yml b/roles/openwrt/image/tasks/fetch.yml index f68c87db..66a56572 100644 --- a/roles/openwrt/image/tasks/fetch.yml +++ b/roles/openwrt/image/tasks/fetch.yml @@ -48,5 +48,7 @@ - "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256" - "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256.asc" - "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}" - - fail: + + - name: the download has failed... + fail: msg: Something borked diff --git a/roles/openwrt/image/tasks/main.yml b/roles/openwrt/image/tasks/main.yml index 1781d9ee..92e36c88 100644 --- a/roles/openwrt/image/tasks/main.yml +++ b/roles/openwrt/image/tasks/main.yml @@ -11,7 +11,8 @@ path: "{{ openwrt_output_dir }}" state: directory - - set_fact: + - name: generate list of packages to add or remove + set_fact: openwrt_packages: >- {{ openwrt_packages_remove | map('regex_replace', '^', '-') | join(' ') }} {{ openwrt_packages_add | join(' ') }} diff --git a/roles/openwrt/image/tasks/prepare.yml b/roles/openwrt/image/tasks/prepare.yml index 3414371f..887143d9 100644 --- a/roles/openwrt/image/tasks/prepare.yml +++ b/roles/openwrt/image/tasks/prepare.yml @@ -4,7 +4,8 @@ state: directory register: tmpdir -- set_fact: +- name: set variables needed to build images + set_fact: openwrt_imgbuilder_dir: "{{ tmpdir.path }}" openwrt_imgbuilder_files: "{{ tmpdir.path }}/files" @@ -83,7 +84,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 }}" |