improve chaos-at-home grouping to make apt-repo provider config clearer

9 files changed, 46 insertions, 43 deletions

diff --git a/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml b/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml
deleted file mode 100644
index 8e1f3db1..00000000
--- a/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-zsh_banner: chaos-at-home
-
-admin_users_group:
-  - equinox
-
-acmetool_account_email: admin@chaos-at-home.org
-
-apt_repo_provider: anexia
-
-apt_repo_blackmagic_auth:
-  username: "chaos-at-home"
-  password: "{{ vault_apt_repo_blackmagic_auth.password }}"
diff --git a/inventory/group_vars/chaos-at-home/vars.yml b/inventory/group_vars/chaos-at-home/vars.yml
index d5ee34e3..0f0a8d0d 100644
--- a/inventory/group_vars/chaos-at-home/vars.yml
+++ b/inventory/group_vars/chaos-at-home/vars.yml
@@ -3,11 +3,6 @@ zsh_banner: chaos-at-home
 
 acme_account_email: admin@chaos-at-home.org
 
-apt_repo_provider: chaos-at-home-cache
-docker_com_apt_repo_baseurl: http://apt.chaos-at-home.org/docker-com
-kubernetes_apt_repo_baseurl: http://apt.chaos-at-home.org/kubernetes
-spreadspace_apt_repo_baseurl: http://apt.chaos-at-home.org/spreadspace
-
 apt_repo_blackmagic_auth:
   username: "chaos-at-home"
   password: "{{ vault_apt_repo_blackmagic_auth.password }}"
diff --git a/inventory/group_vars/chaos-at-home_hetzner/vars.yml b/inventory/group_vars/chaos-at-home_hetzner/vars.yml
new file mode 100644
index 00000000..5ba257ac
--- /dev/null
+++ b/inventory/group_vars/chaos-at-home_hetzner/vars.yml
@@ -0,0 +1,2 @@
+---
+apt_repo_provider: hetzner
diff --git a/inventory/group_vars/chaos-at-home_mur-at/vars.yml b/inventory/group_vars/chaos-at-home_mur-at/vars.yml
new file mode 100644
index 00000000..a5990598
--- /dev/null
+++ b/inventory/group_vars/chaos-at-home_mur-at/vars.yml
@@ -0,0 +1,2 @@
+---
+apt_repo_provider: ffgraz
diff --git a/inventory/group_vars/chaos-at-home_n28/vars.yml b/inventory/group_vars/chaos-at-home_n28/vars.yml
new file mode 100644
index 00000000..72806e7f
--- /dev/null
+++ b/inventory/group_vars/chaos-at-home_n28/vars.yml
@@ -0,0 +1,5 @@
+---
+apt_repo_provider: chaos-at-home-cache
+docker_com_apt_repo_baseurl: http://apt.chaos-at-home.org/docker-com
+kubernetes_apt_repo_baseurl: http://apt.chaos-at-home.org/kubernetes
+spreadspace_apt_repo_baseurl: http://apt.chaos-at-home.org/spreadspace
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index b8716d05..baf60b5e 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -9,8 +9,6 @@ install:
 external_ip: "116.203.212.131"
 external_ip6: "2a01:4f8:c2c:906c::2"
 
-apt_repo_provider: hetzner
-
 apt_repo_components:
   - main
   - contrib  ## for zfs
diff --git a/inventory/host_vars/ch-repo.yml b/inventory/host_vars/ch-repo.yml
index ee0c459f..8ff107a5 100644
--- a/inventory/host_vars/ch-repo.yml
+++ b/inventory/host_vars/ch-repo.yml
@@ -1,4 +1,6 @@
 ---
+## for installation only
+# apt_repo_provider: anexia
 install_jumphost: ch-jump
 
 install:
@@ -39,8 +41,6 @@ network:
   - *_network_primary_
 
 
-apt_repo_provider: anexia
-
 spreadspace_apt_repo_components:
   - prometheus
 
diff --git a/inventory/host_vars/ch-testvm-hcloud.yml b/inventory/host_vars/ch-testvm-hcloud.yml
index f9e59624..66a1ab01 100644
--- a/inventory/host_vars/ch-testvm-hcloud.yml
+++ b/inventory/host_vars/ch-testvm-hcloud.yml
@@ -5,6 +5,3 @@ install:
   cloud:
     credentials:
       token: "{{ vault_hcloud_api_token }}"
-
-
-apt_repo_provider: hetzner
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 2a0331a4..01d3eae3 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -8,11 +8,7 @@ python_basename=python3
 ###############################
 # environment: chaos-at-home
 
-[chaos-at-home:vars]
-host_domain=chaos-at-home.org
-env_group=chaos-at-home
-
-[chaos-at-home]
+[chaos-at-home_n28]
 ch-phoebe host_name=phoebe
 ch-testvm-phoebe host_name=testvm-phoebe
 ch-router host_name=router
@@ -22,8 +18,6 @@ ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump
 ch-nic host_name=nic
 ch-gw-c3voc host_name=gw-c3voc
 ch-equinox-ws host_name=equinox-ws
-ch-equinox-t450s host_name=equinox-t450s
-ch-chromebook host_name=chromebook
 ch-prometheus host_name=prometheus
 ch-apps host_name=apps
 ch-repo host_name=repo
@@ -43,14 +37,6 @@ ch-cm4-sensors1 host_name=cm4-sensors1
 ch-mclr host_name=mclr
 ch-mcbr host_name=mcbr
 ch-octopi host_name=octopi
-ch-atlas host_name=atlas
-ch-pan-legacy host_name=pan
-ch-pan host_name=pan
-ch-testvm-atlas host_name=testvm-atlas
-ch-mimas-legacy host_name=mimas
-ch-mimas host_name=mimas
-ch-testvm-hcloud host_name=testvm-hcloud
-ch-testvm-edis host_name=testvm-edis
 
 ch-telesto host_name=telesto
 ch-calypso host_name=calypso
@@ -77,17 +63,46 @@ ch-hdmistick host_name=hdmistick
 ch-companion-raspi
 ch-rpi5-test
 
-[chaos-at-home:children]
-mz-chaos-at-home
+[chaos-at-home_n28:children]
 chaos-at-home-switches
 chaos-at-home-ap
 chaos-at-home-sensors
 chaos-at-home-ups
 
-[mz-chaos-at-home]
+[chaos-at-home_mz]
 mz-router ansible_host=chmz-router
 mz-ap ansible_host=chmz-ap
 
+[chaos-at-home_mur-at]
+ch-atlas host_name=atlas
+ch-pan-legacy host_name=pan
+ch-pan host_name=pan
+ch-testvm-atlas host_name=testvm-atlas
+
+[chaos-at-home_hetzner]
+ch-mimas-legacy host_name=mimas
+ch-mimas host_name=mimas
+ch-testvm-hcloud host_name=testvm-hcloud
+
+[chaos-at-home_edis]
+ch-testvm-edis host_name=testvm-edis
+
+
+[chaos-at-home:vars]
+host_domain=chaos-at-home.org
+env_group=chaos-at-home
+
+[chaos-at-home]
+ch-equinox-t450s host_name=equinox-t450s
+ch-chromebook host_name=chromebook
+[chaos-at-home:children]
+chaos-at-home_n28
+chaos-at-home_mz
+chaos-at-home_mur-at
+chaos-at-home_hetzner
+chaos-at-home_edis
+
+
 [chaos-at-home-switches:vars]
 ansible_port=22
 [chaos-at-home-switches]
@@ -545,6 +560,7 @@ sk-torrent
 r3-0x10
 
 [hetzner:children]
+chaos-at-home_hetzner
 hroot
 hcloud
 
@@ -562,6 +578,7 @@ ch-testvm-edis
 
 [edis:children]
 edis-kvm
+chaos-at-home_edis
 
 
 ## misc