summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-05-20 21:04:11 +0200
committerChristian Pointner <equinox@spreadspace.org>2023-05-20 21:04:11 +0200
commit10a31c6e265db5f7486d58775392df031cce614c (patch)
treec2130706933bd6109eb91508a65df564cfb9785e
parentupdate gpg keys for equinox (diff)
move ch-omd to graveyard
-rw-r--r--_graveyard_/chaos-at-home/ch-omd.yml (renamed from chaos-at-home/ch-omd.yml)0
-rw-r--r--_graveyard_/inventory/group_vars/chaos-at-home/network.yml4
-rw-r--r--_graveyard_/inventory/host_vars/ch-omd.yml (renamed from inventory/host_vars/ch-omd.yml)0
-rw-r--r--_graveyard_/inventory/hosts.ini4
-rw-r--r--inventory/group_vars/chaos-at-home/network.yml1
-rw-r--r--inventory/hosts.ini2
6 files changed, 8 insertions, 3 deletions
diff --git a/chaos-at-home/ch-omd.yml b/_graveyard_/chaos-at-home/ch-omd.yml
index 35d48ce9..35d48ce9 100644
--- a/chaos-at-home/ch-omd.yml
+++ b/_graveyard_/chaos-at-home/ch-omd.yml
diff --git a/_graveyard_/inventory/group_vars/chaos-at-home/network.yml b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml
index 0437d77d..dd541798 100644
--- a/_graveyard_/inventory/group_vars/chaos-at-home/network.yml
+++ b/_graveyard_/inventory/group_vars/chaos-at-home/network.yml
@@ -1,5 +1,9 @@
---
network_zones:
+ svc:
+ offsets:
+ ch-omd: 231
+
mgmt:
offsets:
ch-gnocchi: 240
diff --git a/inventory/host_vars/ch-omd.yml b/_graveyard_/inventory/host_vars/ch-omd.yml
index 80c6d632..80c6d632 100644
--- a/inventory/host_vars/ch-omd.yml
+++ b/_graveyard_/inventory/host_vars/ch-omd.yml
diff --git a/_graveyard_/inventory/hosts.ini b/_graveyard_/inventory/hosts.ini
index 2b79221f..41bf5d84 100644
--- a/_graveyard_/inventory/hosts.ini
+++ b/_graveyard_/inventory/hosts.ini
@@ -3,6 +3,7 @@
[chaos-at-home]
ch-gnocchi host_name=gnocchi
+ch-omd host_name=omd
[realraum:children]
@@ -77,6 +78,9 @@ ch-gnocchi
[vmhost-ch-gnocchi:children]
vmhost-ch-gnocchi-guests
+[vmhost-ch-prometheus-guests]
+ch-omd
+
[kvmhosts]
ch-gnocchi
diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index d72f13ce..a9453eee 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -85,7 +85,6 @@ network_zones:
__svc_http__: 80
__svc_imap__: 143
ch-mon: 230
- ch-omd: 231
ch-router-obsd: 253
ch-router: 254
#############
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 7266e017..710b2c9e 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -35,7 +35,6 @@ ch-installsmb host_name=installsmb
ch-iot host_name=iot
ch-vpn host_name=vpn
ch-mon host_name=mon
-ch-omd host_name=omd
ch-epimetheus host_name=epimetheus
ch-mclr host_name=mclr
ch-mcbr host_name=mcbr
@@ -388,7 +387,6 @@ ch-testvm-openwrt
ch-iot
ch-vpn
ch-mon
-ch-omd
ch-k8s-ctrl
ch-installsmb
[vmhost-ch-prometheus]