fixed renaming of gnocci host_vars directories

[noc.git] / ansible / roles / openwrt-image / defaults / main.yml

diff --git a/ansible/roles/openwrt-image/defaults/main.yml b/ansible/roles/openwrt-image/defaults/main.yml
index 6c94890..f00a2e8 100644 (file)
--- a/ansible/roles/openwrt-image/defaults/main.yml
+++ b/ansible/roles/openwrt-image/defaults/main.yml
@@ -1,10 +1,16 @@
+---
+openwrt_variant: lede
 openwrt_release: 17.01.4
-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: []