elevate mediachannel: refactor group and hostnames

1 files changed, 51 insertions, 71 deletions

diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index b43eb755..9f1ad97f 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -68,10 +68,8 @@ chaos-at-home-ups
 mz-router ansible_host=chmz-router
 mz-ap ansible_host=chmz-ap
 
-
 [chaos-at-home-switches:vars]
 ansible_port=22
-
 [chaos-at-home-switches]
 ch-sw0 host_name=sw0 ansible_host=192.168.42.200
 ch-sw1 host_name=sw1 ansible_host=192.168.42.201
@@ -183,34 +181,6 @@ sk-testvm host_name=testvm
 sk-torrent host_name=torrent
 
 
-[ele-ap]
-# ele-ap-forum[0:3]
-# ele-ap-parkhouse0
-# ele-ap-orpheum0
-# ele-ap-uhrturm0
-# ele-ap-nextlib[0:6]
-ele-ap-hmtsaal[0:3]
-ele-ap-leslie[0:1]
-
-[ele-ups]
-# ele-ups-forum[0:1]
-# ele-ups-uhrturm0
-# ele-ups-parkhouse0
-# ele-ups-nextlib[0:3]
-ele-ups-hmtsaal[0:2]
-ele-ups-leslie0
-
-
-[ele-dolmetsch-raspi]
-ele-dol-raspi0
-ele-dol-raspi1
-
-[ele-infobeamer]
-ele-infobeamer-emc
-ele-infobeamer-orpheum
-ele-infobeamer-dom
-ele-infobeamer-default
-
 [elevate:vars]
 host_domain=elevate.at
 env_group=dan
@@ -248,25 +218,51 @@ ele-ups
 ele-dolmetsch-raspi
 ele-infobeamer
 
+[ele-ap]
+# ele-ap-forum[0:3]
+# ele-ap-parkhouse0
+# ele-ap-orpheum0
+# ele-ap-uhrturm0
+# ele-ap-nextlib[0:6]
+ele-ap-hmtsaal[0:3]
+ele-ap-leslie[0:1]
+
+[ele-ups]
+# ele-ups-forum[0:1]
+# ele-ups-uhrturm0
+# ele-ups-parkhouse0
+# ele-ups-nextlib[0:3]
+ele-ups-hmtsaal[0:2]
+ele-ups-leslie0
+
+[ele-dolmetsch-raspi]
+ele-dol-raspi0
+ele-dol-raspi1
 
-[emc:vars]
+[ele-infobeamer]
+ele-infobeamer-emc
+ele-infobeamer-orpheum
+ele-infobeamer-dom
+ele-infobeamer-default
+
+
+[elevate-mediachannel:vars]
 host_domain=elev8.at
 env_group=dan
 
-[emc]
-emc-ctrl
-
-[emc:children]
-emc-dist
-emc-xx
-#emc-todelete
+[elevate-mediachannel]
+ele-emc-ctrl host_name=emc-ctrl
+[elevate-mediachannel:children]
+elevate-mediachannel-relay
+elevate-mediachannel-edge
 
-[emc-dist]
-emc-dist0
+[elevate-mediachannel-relay]
+ele-emc-r0 host_name=emc-r0
 
-[emc-xx]
-emc-00
-emc-0[1:3]
+[elevate-mediachannel-edge]
+ele-emc-e01 host_name=emc-e01
+ele-emc-e02 host_name=emc-e02
+#ele-emc-e03 host_name=emc-e03
 
 
 ###############################
@@ -375,7 +371,7 @@ sk-testvm
 sk-torrent
 ch-mimas
 ele-gwhetzner
-emc-ctrl
+ele-emc-ctrl
 sgg-icecast
 [vmhost-sk-2019vm]
 sk-2019vm
@@ -447,7 +443,7 @@ ele-telesto
 #ele-ap
 #ele-ups
 promzone-elevate-festival-server
-#emc
+#elevate-mediachannel
 
 
 ## openvpn
@@ -479,11 +475,11 @@ glt-meet2
 glt-stream
 
 [hcloud:children]
-emc-dist
-emc-xx
+elevate-mediachannel-relay
+elevate-mediachannel-edge
 
 [hetzner]
-emc-ctrl
+ele-emc-ctrl
 sk-testvm
 sk-torrent
 sgg-icecast
@@ -516,7 +512,7 @@ ele-dolmetsch-raspi
 
 [elevate-festival:children]
 elevate
-k8s-emc
+elevate-mediachannel
 
 
 
@@ -555,34 +551,18 @@ standalone-kubelet
 
 
 ### Kubernetes Cluster: emc
-[k8s-emc-encoder]
+[k8s-emc]
+ele-emc-ctrl
 ele-telesto
 ele-dione
 
-[k8s-emc-distribution:children]
-emc-dist
-
-[k8s-emc-streamer:children]
-emc-xx
-
-[k8s-emc-ctrl]
-emc-ctrl
-
 [k8s-emc:children]
-k8s-emc-ctrl
-k8s-emc-encoder
-k8s-emc-distribution
-k8s-emc-streamer
+elevate-mediachannel-relay
+elevate-mediachannel-edge
 
 
 ### Kubernetes Cluster: chtest
-[k8s-chtest-encoder]
+[k8s-chtest]
+ch-k8s-ctrl
 ch-dione
 ch-helene
-
-[k8s-chtest-ctrl]
-ch-k8s-ctrl
-
-[k8s-chtest:children]
-k8s-chtest-ctrl
-k8s-chtest-encoder