use shared playbook for openwrt image generation

22 files changed, 166 insertions, 79 deletions

diff --git a/chaos-at-home/ch-ap.yml b/chaos-at-home/ch-ap.yml
deleted file mode 100644
index 5dcb5ea2..00000000
--- a/chaos-at-home/ch-ap.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: chaos-at-home-ap
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
diff --git a/chaos-at-home/ch-router.yml b/chaos-at-home/ch-router.yml
deleted file mode 100644
index 6543ce8c..00000000
--- a/chaos-at-home/ch-router.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: ch-router
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
diff --git a/chaos-at-home/openwrt.yml b/chaos-at-home/openwrt.yml
new file mode 100644
index 00000000..9a02c8c6
--- /dev/null
+++ b/chaos-at-home/openwrt.yml
@@ -0,0 +1,18 @@
+---
+- name: generate OpenWRT image
+  hosts: "{{ install_hostname }}"
+  connection: local
+  gather_facts: no
+
+  roles:
+  - role: openwrt/image
+  post_tasks:
+  - name: print resulting files
+    pause:
+      seconds: 0
+      prompt: |
+        You can find the newly generated files here:
+
+        {% for image in openwrt_output_images %}
+          {{ image | realpath }}
+        {% endfor %}
diff --git a/dan/ele-ap.yml b/dan/ele-ap.yml
deleted file mode 100644
index 1bccdc57..00000000
--- a/dan/ele-ap.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Basic Setup
-  hosts: ele-ap
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
-  # post_tasks:
-  # - name: copy image to target
-  #   command: "scp '{{ openwrt_output_images[0] }}' '{{ inventory_hostname }}:/tmp/ansible-upgrade.img'"
-
-  # - name: run sysupgrade
-  #   command: "ssh '{{ inventory_hostname }}' sysupgrade -n '/tmp/ansible-upgrade.img'"
-  #   ignore_errors: true
-  #   failed_when: false
-  #   register: sysupgrade_result
-
-  # - debug:
-  #     var: sysupgrade_result.stdout
diff --git a/dan/ele-orpheum.yml b/dan/ele-orpheum.yml
deleted file mode 100644
index 140d4fef..00000000
--- a/dan/ele-orpheum.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: ele-orpheum
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
diff --git a/dan/ele-router.yml b/dan/ele-router.yml
deleted file mode 100644
index ebb8f8bd..00000000
--- a/dan/ele-router.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: ele-router
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
diff --git a/dan/ele-tub.yml b/dan/ele-tub.yml
deleted file mode 100644
index 01668916..00000000
--- a/dan/ele-tub.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: ele-tub
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
diff --git a/dan/ele-ups.yml b/dan/openwrt.yml
index de4efce7..24ea76ec 100644
--- a/dan/ele-ups.yml
+++ b/dan/openwrt.yml
@@ -1,12 +1,22 @@
 ---
-- name: Basic Setup
-  hosts: ele-ups
+- name: generate OpenWRT image
+  hosts: "{{ install_hostname }}"
   connection: local
   gather_facts: no
 
   roles:
   - role: openwrt/image
-  # post_tasks:
+  post_tasks:
+  - name: print resulting files
+    pause:
+      seconds: 0
+      prompt: |
+        You can find the newly generated files here:
+
+        {% for image in openwrt_output_images %}
+          {{ image | realpath }}
+        {% endfor %}
+
   # - name: copy image to target
   #   command: "scp '{{ openwrt_output_images[0] }}' '{{ inventory_hostname }}:/tmp/ansible-upgrade.img'"
 
diff --git a/inventory/group_vars/accesspoints/vars.yml b/inventory/group_vars/accesspoints/vars.yml
index 6f3181f7..24d59ef3 100644
--- a/inventory/group_vars/accesspoints/vars.yml
+++ b/inventory/group_vars/accesspoints/vars.yml
@@ -54,6 +54,8 @@ accesspoint_wireless_devices:
 accesspoint_wireless_ifaces: {}
 
 
+install_playbook: openwrt
+
 openwrt_variant: openwrt
 openwrt_release: 19.07.6
 openwrt_arch: ath79
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 55142a81..9faec19c 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -21,6 +21,7 @@ network_zones:
       ch-helene: 24
       ch-hpws-maxi: 30
       ch-hpws-mini1: 31
+      ch-alix1d: 32
       ch-prometheus: 200
       ch-epimetheus: 201
       ch-gw-lan: 254
diff --git a/inventory/group_vars/ele-ups/vars.yml b/inventory/group_vars/ele-ups/vars.yml
index b19f68e5..182e7363 100644
--- a/inventory/group_vars/ele-ups/vars.yml
+++ b/inventory/group_vars/ele-ups/vars.yml
@@ -5,6 +5,9 @@ ssh_users_root:
 
 network_mgmt_zone: "{{ network_zones.mgmt }}"
 
+
+install_playbook: openwrt
+
 openwrt_variant: openwrt
 openwrt_release: 19.07.7
 openwrt_arch: ramips
diff --git a/inventory/host_vars/ch-alix1d.yml b/inventory/host_vars/ch-alix1d.yml
new file mode 100644
index 00000000..585b1990
--- /dev/null
+++ b/inventory/host_vars/ch-alix1d.yml
@@ -0,0 +1,98 @@
+---
+install_playbook: openwrt
+
+openwrt_variant: openwrt
+openwrt_release: 19.07.7
+openwrt_arch: x86
+openwrt_target: geode
+openwrt_profile: Generic
+openwrt_output_image_suffixes:
+  - "combined-ext4.img.gz"
+
+openwrt_packages_remove:
+  - ppp
+  - ppp-mod-pppoe
+  - firewall
+  - dnsmasq
+  - odhcpd-ipv6only
+  - linux-atm
+  - kmod-pppoa
+  - kmod-mppe
+  - ppp-mod-pppoa
+  - pppstats
+  - pppdump
+  - iwinfo
+  - soloscli
+openwrt_packages_add:
+  - haveged
+  - htop
+  - ip
+  - less
+  - nano
+  - tcpdump-mini
+  - iperf
+  - iperf3
+  - mtr
+  - iptraf-ng
+
+
+openwrt_mixin:
+  /etc/dropbear/authorized_keys:
+    content: "{{ ssh_keys_root | join('\n') }}\n"
+
+  /etc/htoprc:
+    file: "{{ global_files_dir }}/common/htoprc"
+
+
+openwrt_uci:
+  system:
+    - name: system
+      options:
+        hostname: '{{ host_name }}'
+        timezone: 'CET-1CEST,M3.5.0,M10.5.0/3'
+        ttylogin: '0'
+        log_size: '64'
+        urandom_seed: '0'
+
+    - name: timeserver 'ntp'
+      options:
+        enabled: '1'
+        enable_server: '0'
+        server:
+          - '0.lede.pool.ntp.org'
+          - '1.lede.pool.ntp.org'
+          - '2.lede.pool.ntp.org'
+          - '3.lede.pool.ntp.org'
+
+  dropbear:
+    - name: dropbear
+      options:
+        PasswordAuth: 'off'
+        RootPasswordAuth: 'off'
+        Port: '{{ ansible_port }}'
+
+  network:
+    - name: globals 'globals'
+      options:
+        ula_prefix: "fc{{ '%02x:%04x:%04x' | format((255 | random(seed=inventory_hostname + '0')), (65535 | random(seed=inventory_hostname + '1')), (65535 | random(seed=inventory_hostname + '2'))) }}::/48"
+
+    - name: interface 'loopback'
+      options:
+        ifname: lo
+        proto: static
+        ipaddr: 127.0.0.1
+        netmask: 255.0.0.0
+
+    - name: interface 'lan'
+      options:
+        ifname: eth0
+        proto: static
+        ipaddr: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
+        netmask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+        gateway: "{{ network_zones.lan.gateway }}"
+        dns: "{{ network_zones.lan.dns }}"
+
+    - name: interface 'unused'
+      options:
+        ifname: eth1
+        proto: none
diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index d7463837..c986124f 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -1,4 +1,6 @@
 ---
+install_playbook: openwrt
+
 openwrt_variant: openwrt
 openwrt_release: 19.07.7
 openwrt_arch: x86
diff --git a/inventory/host_vars/ele-orpheum.yml b/inventory/host_vars/ele-orpheum.yml
index 6c50e21b..c6d25b4d 100644
--- a/inventory/host_vars/ele-orpheum.yml
+++ b/inventory/host_vars/ele-orpheum.yml
@@ -1,4 +1,6 @@
 ---
+install_playbook: openwrt
+
 openwrt_variant: openwrt
 openwrt_release: 19.07.1
 openwrt_arch: x86
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index a8289649..aebc6e8b 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -197,6 +197,7 @@ openwrt_dhcp_base:
       ignore: '1'
 
 
+install_playbook: openwrt
 
 openwrt_variant: openwrt
 openwrt_release: 19.07.7
diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml
index a89261ae..24d35b2d 100644
--- a/inventory/host_vars/ele-tub.yml
+++ b/inventory/host_vars/ele-tub.yml
@@ -3,6 +3,9 @@ ssh_users_root:
   - equinox
   - datacop
 
+
+install_playbook: openwrt
+
 openwrt_variant: openwrt
 openwrt_release: 19.07.7
 openwrt_arch: x86
diff --git a/inventory/host_vars/glt-gw-r3.yml b/inventory/host_vars/glt-gw-r3.yml
index a8957b43..3fc1978f 100644
--- a/inventory/host_vars/glt-gw-r3.yml
+++ b/inventory/host_vars/glt-gw-r3.yml
@@ -1,4 +1,6 @@
 ---
+install_playbook: openwrt
+
 openwrt_variant: openwrt
 openwrt_release: 19.07.7
 openwrt_arch: x86
diff --git a/inventory/host_vars/glt-gw-tug.yml b/inventory/host_vars/glt-gw-tug.yml
index d1bbfa95..5b22ecae 100644
--- a/inventory/host_vars/glt-gw-tug.yml
+++ b/inventory/host_vars/glt-gw-tug.yml
@@ -1,4 +1,6 @@
 ---
+install_playbook: openwrt
+
 openwrt_variant: openwrt
 openwrt_release: 19.07.7
 openwrt_arch: x86
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 3be1b448..1d684ac8 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -48,6 +48,7 @@ ch-helene host_name=helene
 ch-k8s-master host_name=k8s-master
 ch-hpws-maxi
 ch-hpws-mini1
+ch-alix1d
 
 [chaos-at-home:children]
 mz-chaos-at-home
diff --git a/spreadspace/glt-gw-r3.yml b/spreadspace/glt-gw-r3.yml
deleted file mode 100644
index c3123092..00000000
--- a/spreadspace/glt-gw-r3.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: glt-gw-r3
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
diff --git a/spreadspace/glt-gw-tug.yml b/spreadspace/glt-gw-tug.yml
deleted file mode 100644
index f9e40e2e..00000000
--- a/spreadspace/glt-gw-tug.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: glt-gw-tug
-  connection: local
-  gather_facts: no
-
-  roles:
-  - role: openwrt/image
diff --git a/spreadspace/openwrt.yml b/spreadspace/openwrt.yml
new file mode 100644
index 00000000..9a02c8c6
--- /dev/null
+++ b/spreadspace/openwrt.yml
@@ -0,0 +1,18 @@
+---
+- name: generate OpenWRT image
+  hosts: "{{ install_hostname }}"
+  connection: local
+  gather_facts: no
+
+  roles:
+  - role: openwrt/image
+  post_tasks:
+  - name: print resulting files
+    pause:
+      seconds: 0
+      prompt: |
+        You can find the newly generated files here:
+
+        {% for image in openwrt_output_images %}
+          {{ image | realpath }}
+        {% endfor %}