8 files changed, 34 insertions, 13 deletions
diff --git a/chaos-at-home/ch-gnocchi.yml b/_graveyard_/chaos-at-home/ch-gnocchi.yml
index ba7b9add..ba7b9add 100644
--- a/chaos-at-home/ch-gnocchi.yml
+++ b/_graveyard_/chaos-at-home/ch-gnocchi.yml
diff --git a/_graveyard_/inventory/group_vars/chaos-at-home/network.yml b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml
new file mode 100644
index 00000000..0437d77d
--- /dev/null
+++ b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml
@@ -0,0 +1,5 @@
+---
+network_zones:
+  mgmt:
+    offsets:
+      ch-gnocchi: 240
diff --git a/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml b/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml
new file mode 100644
index 00000000..8e1f3db1
--- /dev/null
+++ b/_graveyard_/inventory/group_vars/chaos-at-home/vars.yml
@@ -0,0 +1,13 @@
+---
+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/vmhost-ch-gnocchi/vars.yml b/_graveyard_/inventory/group_vars/vmhost-ch-gnocchi/vars.yml
index 852b905c..852b905c 100644
--- a/inventory/group_vars/vmhost-ch-gnocchi/vars.yml
+++ b/_graveyard_/inventory/group_vars/vmhost-ch-gnocchi/vars.yml
diff --git a/inventory/host_vars/ch-gnocchi.yml b/_graveyard_/inventory/host_vars/ch-gnocchi.yml
index f0b5ab11..f0b5ab11 100644
--- a/inventory/host_vars/ch-gnocchi.yml
+++ b/_graveyard_/inventory/host_vars/ch-gnocchi.yml
diff --git a/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini
index dc326c3d..bc1fafdb 100644
--- a/_graveyard_/inventory/hosts.ini
+++ b/_graveyard_/inventory/hosts.ini
@@ -1,6 +1,10 @@
 ###############################
 # environment: chaos-at-home
 
+[chaos-at-home]
+ch-gnocchi host_name=gnocchi
+
+
 [realraum:children]
 r3-cccamp19
 
@@ -36,7 +40,16 @@ ele-dolmetsch-ctl
 r3-cccamp19-sw0
 
 
+## virtualization
+[vmhost-ch-gnocchi-guests]
+[vmhost-ch-gnocchi]
+ch-gnocchi
+[vmhost-ch-gnocchi:children]
+vmhost-ch-gnocchi-guests
+
+
 [kvmhosts]
+ch-gnocchi
 r3-cccamp19-dione
 r3-cccamp19-helene
 
@@ -45,6 +58,8 @@ r3-cccamp19-flora
 r3-cccamp19-verr
 r3-cccamp19-feedcode
 r3-cccamp19-av
+[kvmguests:children]
+vmhost-ch-gnocchi-guests
 
 
 [dolmetsch-ctl:children]
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 6807c104..36509588 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -99,7 +99,6 @@ network_zones:
       ch-ap0: 220
       ch-ap1: 221
       ch-mon: 230
-      ch-gnocchi: 240
       ch-router: 241
 
   magenta:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 6802f77c..b7f02e0d 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -13,7 +13,6 @@ host_domain=chaos-at-home.org
 env_group=chaos-at-home
 
 [chaos-at-home]
-ch-gnocchi host_name=gnocchi
 ch-phoebe host_name=phoebe
 ch-testvm-phoebe host_name=testvm-phoebe
 ch-testvm-openwrt host_name=testvm-openwrt
@@ -330,7 +329,6 @@ ch-prometheus-legacy
 ch-pan
 ch-mimas
 ch-mimas2
-ch-gnocchi
 s2-build
 lw-master
 sk-2019
@@ -344,13 +342,6 @@ ele-gwhetzner
 
 
 ## virtualization
-[vmhost-ch-gnocchi-guests]
-ch-nic
-[vmhost-ch-gnocchi]
-ch-gnocchi
-[vmhost-ch-gnocchi:children]
-vmhost-ch-gnocchi-guests
-
 [vmhost-ch-phoebe-guests]
 ch-testvm-phoebe
 ch-testvm-openwrt
@@ -358,7 +349,7 @@ ch-router
 ch-router-obsd
 ch-jump
 ch-gw-lan
-#ch-nic
+ch-nic
 [vmhost-ch-phoebe]
 ch-phoebe
 [vmhost-ch-phoebe:children]
@@ -421,7 +412,6 @@ vmhost-ele-telesto-guests
 
 
 [kvmhosts]
-ch-gnocchi
 ch-phoebe
 ch-prometheus
 ch-atlas
@@ -430,7 +420,6 @@ sk-tomnext
 ele-telesto
 
 [kvmguests:children]
-vmhost-ch-gnocchi-guests
 vmhost-ch-phoebe-guests
 vmhost-ch-prometheus-guests
 vmhost-ch-atlas-guests