move ch-gnocchi to graveyard

4 files changed, 1 insertions, 71 deletions

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/group_vars/vmhost-ch-gnocchi/vars.yml b/inventory/group_vars/vmhost-ch-gnocchi/vars.yml
deleted file mode 100644
index 852b905c..00000000
--- a/inventory/group_vars/vmhost-ch-gnocchi/vars.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-__vmhost_bridge_interface_zones__:
-  enp1s0:
-  - lan
-  - svc
-  enp2s0:
-  - magenta
-  enp3s0:
-  - mgmt
-  - iot
-
-__vmhost_bridge_interface_zones_yaml__: |
-  {% for interface in (__vmhost_bridge_interface_zones__.keys() | sort) %}
-  {%   for zone in __vmhost_bridge_interface_zones__[interface] %}
-  {{ zone }}:
-    interfaces:
-      - {{ interface }}.{{ network_zones[zone].vlan }}
-  {%   endfor %}
-  {% endfor %}
-
-
-vm_host:
-  name: ch-gnocchi
-  network:
-    bridges: "{{ __vmhost_bridge_interface_zones_yaml__ | from_yaml }}"
diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml
deleted file mode 100644
index f0b5ab11..00000000
--- a/inventory/host_vars/ch-gnocchi.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-install_interface: enp2s0
-install_dhcp: true
-
-install:
-  disks:
-    primary: /dev/disk/by-id/ata-Samsung_SSD_860_EVO_mSATA_250GB_S41MNC0KA13977X
-  kernel_cmdline:
-    - console=ttyS0,115200n8
-
-network:
-  domain: "{{ host_domain }}"
-  interfaces:
-  - name: br-mgmt
-    address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-  vlans:
-    enp1s0: "{{ __vmhost_bridge_interface_zones__['enp1s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
-    enp2s0: "{{ __vmhost_bridge_interface_zones__['enp2s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
-    enp3s0: "{{ __vmhost_bridge_interface_zones__['enp3s0'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
-
-
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
-
-installer_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: installer
-  size: 10G
-  fs: ext4
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