X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fopenwrt-image%2Fdefaults%2Fmain.yml;h=f00a2e80250896c34eff901ed4d85fd3395643a2;hb=a4afa06c56a7c8e50f9ef94bb2cc1d8bba47a5b6;hp=e0724a8f739508c0de6bc4958e0fe860bc950e2e;hpb=4649fe7abd60b492916e07f614f85378c433b433;p=noc.git

diff --git a/ansible/roles/openwrt-image/defaults/main.yml b/ansible/roles/openwrt-image/defaults/main.yml
index e0724a8..f00a2e8 100644
--- a/ansible/roles/openwrt-image/defaults/main.yml
+++ b/ansible/roles/openwrt-image/defaults/main.yml
@@ -1,11 +1,16 @@
 ---
+openwrt_variant: lede
 openwrt_release: 17.01.4
-openwrt_download_dir: .cache/openwrt
-openwrt_tarball_basename: lede-imagebuilder-{{ openwrt_release }}-{{ openwrt_arch }}{% if openwrt_target != 'generic' %}-{{ openwrt_target }}{% endif %}.Linux-x86_64
+openwrt_download_dir: "{{ global_cache_dir }}/openwrt"
+openwrt_tarball_basename: "{{ openwrt_variant }}-imagebuilder-{{ openwrt_release }}-{{ openwrt_arch }}-{{ openwrt_target }}.Linux-x86_64"
 openwrt_tarball_name: "{{ openwrt_tarball_basename }}.tar.xz"
 openwrt_target: generic
-openwrt_output_dir: files/openwrt
 
+openwrt_output_dir: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/openwrt"
+openwrt_output_image_name_base: "{{ openwrt_variant }}-{{ openwrt_release }}-{{ openwrt_arch }}{% if openwrt_target != 'generic' %}-{{ openwrt_target }}{% endif %}"
+openwrt_output_image_suffixes:
+  - squashfs-sysupgrade.bin
+  - squashfs-factory.bin
 
 openwrt_packages_remove: []
 openwrt_packages_add: []