From 29a177b4093f8b4620c14d162336889111eef2db Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 1 Jan 2022 17:44:30 +0100
Subject: generate openwrt images using image-generate.sh

---
 chaos-at-home/image-generate.yml      |  7 +++++++
 dan/image-generate.yml                |  7 +++++++
 image-generate.sh                     |  1 +
 inventory/host_vars/ch-alix1d.yml     | 14 +++++---------
 roles/openwrt/image/defaults/main.yml |  2 +-
 spreadspace/image-generate.yml        |  7 +++++++
 6 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 chaos-at-home/image-generate.yml
 create mode 100644 dan/image-generate.yml
 create mode 120000 image-generate.sh
 create mode 100644 spreadspace/image-generate.yml

diff --git a/chaos-at-home/image-generate.yml b/chaos-at-home/image-generate.yml
new file mode 100644
index 00000000..a7d38149
--- /dev/null
+++ b/chaos-at-home/image-generate.yml
@@ -0,0 +1,7 @@
+---
+- name: generate os image
+  hosts: "{{ install_hostnames }}"
+  connection: local
+  gather_facts: no
+  roles:
+  - role: "{{ install_distro }}/image"
diff --git a/dan/image-generate.yml b/dan/image-generate.yml
new file mode 100644
index 00000000..a7d38149
--- /dev/null
+++ b/dan/image-generate.yml
@@ -0,0 +1,7 @@
+---
+- name: generate os image
+  hosts: "{{ install_hostnames }}"
+  connection: local
+  gather_facts: no
+  roles:
+  - role: "{{ install_distro }}/image"
diff --git a/image-generate.sh b/image-generate.sh
new file mode 120000
index 00000000..dd859571
--- /dev/null
+++ b/image-generate.sh
@@ -0,0 +1 @@
+generate.sh
\ No newline at end of file
diff --git a/inventory/host_vars/ch-alix1d.yml b/inventory/host_vars/ch-alix1d.yml
index 133953b6..d7b416d3 100644
--- a/inventory/host_vars/ch-alix1d.yml
+++ b/inventory/host_vars/ch-alix1d.yml
@@ -1,13 +1,9 @@
 ---
-install_playbook: openwrt
-
-openwrt_variant: openwrt
-openwrt_release: 19.07.7
 openwrt_arch: x86
 openwrt_target: geode
-openwrt_profile: Generic
+openwrt_profile: generic
 openwrt_output_image_suffixes:
-  - "combined-ext4.img.gz"
+  - "{{ openwrt_profile }}-ext4-combined.img.gz"
 
 openwrt_packages_remove:
   - ppp
@@ -124,14 +120,14 @@ openwrt_uci:
 
     - name: interface 'loopback'
       options:
-        ifname: lo
+        device: lo
         proto: static
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
     - name: interface 'lan'
       options:
-        ifname: eth0
+        device: eth0
         proto: static
         ipaddr: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
         netmask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
@@ -140,5 +136,5 @@ openwrt_uci:
 
     - name: interface 'unused'
       options:
-        ifname: eth1
+        device: eth1
         proto: none
diff --git a/roles/openwrt/image/defaults/main.yml b/roles/openwrt/image/defaults/main.yml
index a0d888ec..9f867053 100644
--- a/roles/openwrt/image/defaults/main.yml
+++ b/roles/openwrt/image/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 openwrt_variant: openwrt
-# openwrt_release: 17.01.4
+openwrt_release: "{{ install_codename }}"
 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"
diff --git a/spreadspace/image-generate.yml b/spreadspace/image-generate.yml
new file mode 100644
index 00000000..a7d38149
--- /dev/null
+++ b/spreadspace/image-generate.yml
@@ -0,0 +1,7 @@
+---
+- name: generate os image
+  hosts: "{{ install_hostnames }}"
+  connection: local
+  gather_facts: no
+  roles:
+  - role: "{{ install_distro }}/image"
-- 
cgit v1.2.3