summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/ch-apps.yml4
-rw-r--r--chaos-at-home/ch-gw-lan.yml4
-rw-r--r--chaos-at-home/ch-jump.yml4
-rw-r--r--chaos-at-home/ch-phoebe.yml4
-rw-r--r--inventory/host_vars/ch-apps/vars.yml5
-rw-r--r--inventory/host_vars/ch-mimas.yml6
-rw-r--r--inventory/host_vars/ch-phoebe.yml2
7 files changed, 24 insertions, 5 deletions
diff --git a/chaos-at-home/ch-apps.yml b/chaos-at-home/ch-apps.yml
index 3cfc5d24..2fe70485 100644
--- a/chaos-at-home/ch-apps.yml
+++ b/chaos-at-home/ch-apps.yml
@@ -7,6 +7,10 @@
- role: core/sshd/base
- role: core/zsh
- role: core/ntp
+
+- name: Payload Setup
+ hosts: ch-apps
+ roles:
- role: storage/zfs/pools
- role: storage/zfs/sanoid
- role: apt-repo/spreadspace
diff --git a/chaos-at-home/ch-gw-lan.yml b/chaos-at-home/ch-gw-lan.yml
index a230165f..bd620381 100644
--- a/chaos-at-home/ch-gw-lan.yml
+++ b/chaos-at-home/ch-gw-lan.yml
@@ -7,6 +7,10 @@
- role: core/sshd/base
- role: core/zsh
- role: core/ntp
+
+- name: Payload Setup
+ hosts: ch-gw-lan
+ roles:
- role: apt-repo/spreadspace
- role: nginx/base
- role: monitoring/prometheus/exporter
diff --git a/chaos-at-home/ch-jump.yml b/chaos-at-home/ch-jump.yml
index 8078aa65..4a5c1f84 100644
--- a/chaos-at-home/ch-jump.yml
+++ b/chaos-at-home/ch-jump.yml
@@ -7,6 +7,10 @@
- role: core/sshd/base
- role: core/zsh
- role: core/ntp
+
+- name: Payload Setup
+ hosts: ch-jump
+ roles:
- role: core/sshd/jump
- role: network/nftables/base
post_tasks:
diff --git a/chaos-at-home/ch-phoebe.yml b/chaos-at-home/ch-phoebe.yml
index 8234d499..c3fc2ddb 100644
--- a/chaos-at-home/ch-phoebe.yml
+++ b/chaos-at-home/ch-phoebe.yml
@@ -8,6 +8,10 @@
- role: core/zsh
- role: core/ntp
- role: core/cpu-microcode
+
+- name: Payload Setup
+ hosts: ch-phoebe
+ roles:
- role: storage/zfs/pools
- role: storage/zfs/sanoid
- role: vm/host/base
diff --git a/inventory/host_vars/ch-apps/vars.yml b/inventory/host_vars/ch-apps/vars.yml
index 346fb056..03be1a58 100644
--- a/inventory/host_vars/ch-apps/vars.yml
+++ b/inventory/host_vars/ch-apps/vars.yml
@@ -46,8 +46,9 @@ network:
apt_repo_components:
-- main
-- contrib ## for zfs
+ - main
+ - contrib ## for zfs
+ - non-free-firmware
spreadspace_apt_repo_components:
- container
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index 710e4961..b8716d05 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -1,4 +1,5 @@
---
+system_lvm_volume_size_root: 3G
install:
cloud:
credentials:
@@ -11,8 +12,9 @@ external_ip6: "2a01:4f8:c2c:906c::2"
apt_repo_provider: hetzner
apt_repo_components:
-- main
-- contrib ## for zfs
+ - main
+ - contrib ## for zfs
+ - non-free-firmware
spreadspace_apt_repo_components:
- prometheus
diff --git a/inventory/host_vars/ch-phoebe.yml b/inventory/host_vars/ch-phoebe.yml
index 834ec6d5..b05e3f80 100644
--- a/inventory/host_vars/ch-phoebe.yml
+++ b/inventory/host_vars/ch-phoebe.yml
@@ -26,7 +26,7 @@ network:
apt_repo_components:
- main
- contrib ## for zfs
- - non-free ## for microcode updates
+ - non-free-firmware
ssh_keys_root_extra: