16 files changed, 96 insertions, 46 deletions
diff --git a/chaos-at-home/host_vars/r3-cccamp19-sw0.yml b/_graveyard_/chaos-at-home/host_vars/r3-cccamp19-sw0.yml
index 9a0e7782..9a0e7782 100644
--- a/chaos-at-home/host_vars/r3-cccamp19-sw0.yml
+++ b/_graveyard_/chaos-at-home/host_vars/r3-cccamp19-sw0.yml
diff --git a/chaos-at-home/r3-cccamp19-gw.yml b/_graveyard_/chaos-at-home/r3-cccamp19-gw.yml
index e92370ac..e92370ac 100644
--- a/chaos-at-home/r3-cccamp19-gw.yml
+++ b/_graveyard_/chaos-at-home/r3-cccamp19-gw.yml
diff --git a/chaos-at-home/r3-cccamp19-sw0.yml b/_graveyard_/chaos-at-home/r3-cccamp19-sw0.yml
index 36ee99f5..36ee99f5 100644
--- a/chaos-at-home/r3-cccamp19-sw0.yml
+++ b/_graveyard_/chaos-at-home/r3-cccamp19-sw0.yml
diff --git a/chaos-at-home/r3-cccamp19_vm.yml b/_graveyard_/chaos-at-home/r3-cccamp19_vm.yml
index fa4ffb77..fa4ffb77 100644
--- a/chaos-at-home/r3-cccamp19_vm.yml
+++ b/_graveyard_/chaos-at-home/r3-cccamp19_vm.yml
diff --git a/chaos-at-home/r3-vex2.yml b/_graveyard_/chaos-at-home/r3-vex2.yml
index 4efac0a8..4efac0a8 100644
--- a/chaos-at-home/r3-vex2.yml
+++ b/_graveyard_/chaos-at-home/r3-vex2.yml
diff --git a/inventory/group_vars/r3-cccamp19/network.yml b/_graveyard_/inventory/group_vars/r3-cccamp19/network.yml
index 82216ea6..82216ea6 100644
--- a/inventory/group_vars/r3-cccamp19/network.yml
+++ b/_graveyard_/inventory/group_vars/r3-cccamp19/network.yml
diff --git a/inventory/host_vars/r3-cccamp19-av.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-av.yml
index 40524574..40524574 100644
--- a/inventory/host_vars/r3-cccamp19-av.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-av.yml
diff --git a/inventory/host_vars/r3-cccamp19-dione.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-dione.yml
index 47195b1f..47195b1f 100644
--- a/inventory/host_vars/r3-cccamp19-dione.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-dione.yml
diff --git a/inventory/host_vars/r3-cccamp19-feedcode.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-feedcode.yml
index 10f78ebc..10f78ebc 100644
--- a/inventory/host_vars/r3-cccamp19-feedcode.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-feedcode.yml
diff --git a/inventory/host_vars/r3-cccamp19-flora.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-flora.yml
index 40524574..40524574 100644
--- a/inventory/host_vars/r3-cccamp19-flora.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-flora.yml
diff --git a/inventory/host_vars/r3-cccamp19-gw.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-gw.yml
index c6150b4d..c6150b4d 100644
--- a/inventory/host_vars/r3-cccamp19-gw.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-gw.yml
diff --git a/inventory/host_vars/r3-cccamp19-helene.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-helene.yml
index 104a5eda..104a5eda 100644
--- a/inventory/host_vars/r3-cccamp19-helene.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-helene.yml
diff --git a/inventory/host_vars/r3-cccamp19-sw0.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-sw0.yml
index 5b01d940..5b01d940 100644
--- a/inventory/host_vars/r3-cccamp19-sw0.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-sw0.yml
diff --git a/inventory/host_vars/r3-cccamp19-verr.yml b/_graveyard_/inventory/host_vars/r3-cccamp19-verr.yml
index f4e70d57..f4e70d57 100644
--- a/inventory/host_vars/r3-cccamp19-verr.yml
+++ b/_graveyard_/inventory/host_vars/r3-cccamp19-verr.yml
diff --git a/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini
new file mode 100644
index 00000000..f53d6a86
--- /dev/null
+++ b/_graveyard_/inventory/hosts.ini
@@ -0,0 +1,36 @@
+###############################
+# environment: chaos-at-home
+
+[realraum:children]
+r3-cccamp19
+
+[r3-cccamp19:vars]
+host_domain=camp.realraum.at
+
+[r3-cccamp19]
+r3-cccamp19-helene host_name=helene
+r3-cccamp19-dione host_name=dione
+r3-cccamp19-gw
+r3-cccamp19-sw0 ansible_host=192.168.41.200 ansible_port=22
+r3-cccamp19-flora host_name=flora
+r3-cccamp19-verr host_name=verr
+r3-cccamp19-feedcode host_name=feedcode
+r3-cccamp19-av host_name=av
+
+
+###############################
+# host categories
+
+[dellos6]
+r3-cccamp19-sw0
+
+
+[kvmhosts]
+r3-cccamp19-dione
+r3-cccamp19-helene
+
+[kvmguests]
+r3-cccamp19-flora
+r3-cccamp19-verr
+r3-cccamp19-feedcode
+r3-cccamp19-av
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 9add78d3..b7b8f5af 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -70,22 +70,6 @@ ansible_port=22000
 [realraum]
 r3-vex2 host_name=vex2
 
-[realraum:children]
-r3-cccamp19
-
-[r3-cccamp19:vars]
-host_domain=camp.realraum.at
-
-[r3-cccamp19]
-r3-cccamp19-helene host_name=helene
-r3-cccamp19-dione host_name=dione
-r3-cccamp19-gw
-r3-cccamp19-sw0 ansible_host=192.168.41.200 ansible_port=22
-r3-cccamp19-flora host_name=flora
-r3-cccamp19-verr host_name=verr
-r3-cccamp19-feedcode host_name=feedcode
-r3-cccamp19-av host_name=av
-
 
 ###############################
 # environment: spreadspace
@@ -225,9 +209,7 @@ emc-0[1:3]
 ###############################
 # host categories
 
-[dellos6]
-r3-cccamp19-sw0
-
+## OS
 [dellos6:children]
 chaos-at-home-switches
 
@@ -237,41 +219,75 @@ ch-router-obsd
 ch-hroottest-obsd
 
 
-[kvmhosts]
-ch-atlas
+## virtualization
+[vmhost-ch-gnocchi-guests]
+ch-router
+ch-router-obsd
+ch-jump
+ch-gw-lan
+[vmhost-ch-gnocchi]
 ch-gnocchi
-r3-cccamp19-dione
-r3-cccamp19-helene
-sk-2019vm
-sk-tomnext
-ch-hroottest
+[vmhost-ch-gnocchi:children]
+vmhost-ch-gnocchi-guests
 
-[kvmguests]
-emc-master
-lw-master
-ch-keyserver
+[vmhost-ch-atlas-guests]
 ch-testvm
-ch-gw-lan
-ch-jump
-ch-router
-ch-router-obsd
+ele-mur
 r3-vex2
-r3-cccamp19-flora
-r3-cccamp19-verr
-r3-cccamp19-feedcode
-r3-cccamp19-av
+ch-keyserver
+[vmhost-ch-atlas]
+ch-atlas
+[vmhost-ch-atlas:children]
+vmhost-ch-atlas-guests
+
+[vmhost-ch-hroottest-guests]
+ch-hroottest-vm1
+ch-hroottest-obsd
+ch-k8s-m2
+ch-k8s-w[0:1]
+[vmhost-ch-hroottest]
+ch-hroottest
+[vmhost-ch-hroottest:children]
+vmhost-ch-hroottest-guests
+
+[vmhost-sk-2019vm-guests]
 sk-testvm
 sk-torrent
 ch-mimas
 ele-gwhetzner
-ele-mur
+ch-k8s-m[0:1]
+emc-master
+lw-master
+[vmhost-sk-2019vm]
+sk-2019vm
+[vmhost-sk-2019vm:children]
+vmhost-sk-2019vm-guests
+
+[vmhost-sk-tomnext-guests]
 sk-tomnext-nc
 sk-tomnext-hp
-ch-hroottest-vm1
-ch-hroottest-obsd
-ch-k8s-m[0:2]
-ch-k8s-w[0:1]
+[vmhost-sk-tomnext]
+sk-tomnext
+[vmhost-sk-tomnext:children]
+vmhost-sk-tomnext-guests
 
+
+[kvmhosts]
+ch-gnocchi
+ch-atlas
+ch-hroottest
+sk-2019vm
+sk-tomnext
+
+[kvmguests:children]
+vmhost-ch-gnocchi-guests
+vmhost-ch-atlas-guests
+vmhost-ch-hroottest-guests
+vmhost-sk-2019vm-guests
+vmhost-sk-tomnext-guests
+
+
+## hoster
 [hroot]
 sk-2019
 sk-cloudia
@@ -310,7 +326,7 @@ hcloud
 scaleway-kernel
 
 
-
+## misc
 [accesspoints:children]
 ele-ap
 chaos-at-home-ap
@@ -322,8 +338,6 @@ ele-dolmetsch-ctl
 ele-dolmetsch-raspi
 
 
-
-### Elevate Festival
 [elevate-festival:children]
 elevate
 k8s-emc