diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-01-01 17:44:30 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-01 17:44:30 +0100 |
| commit | 29a177b4093f8b4620c14d162336889111eef2db (patch) | |
| tree | 5048b9f3dd01a59f1fad19bdc3174e573f4f0fe8 | |
| parent | vm/guest/define: harmonize disk config (diff) | |
generate openwrt images using image-generate.sh
| -rw-r--r-- | chaos-at-home/image-generate.yml | 7 | ||||
| -rw-r--r-- | dan/image-generate.yml | 7 | ||||
| l--------- | image-generate.sh | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-alix1d.yml | 14 | ||||
| -rw-r--r-- | roles/openwrt/image/defaults/main.yml | 2 | ||||
| -rw-r--r-- | spreadspace/image-generate.yml | 7 |
6 files changed, 28 insertions, 10 deletions
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" |