Merge branch 'topic/preseed-configurable-disk-layout-contd'

24 files changed, 74 insertions, 474 deletions

diff --git a/inventory/group_vars/emc/main.yml b/inventory/group_vars/emc/main.yml
index 02a2e25c..42515184 100644
--- a/inventory/group_vars/emc/main.yml
+++ b/inventory/group_vars/emc/main.yml
@@ -5,8 +5,6 @@ install:
   cloud:
     credentials:
       token: "{{ vault_hcloud_api_token }}"
-  disks:
-    root_lvm_size: all
 
 network: {}
 
diff --git a/inventory/group_vars/k8s-chtest/main.yml b/inventory/group_vars/k8s-chtest/main.yml
deleted file mode 100644
index a7fe0120..00000000
--- a/inventory/group_vars/k8s-chtest/main.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-docker_pkg_provider: docker-com
-docker_pkg_name: docker-ce
-
-kubernetes_version: 1.18.3
-kubernetes_container_runtime: docker
-kubernetes_network_plugin: kubeguard
-kubernetes_network_plugin_replaces_kube_proxy: true
-kubernetes_network_plugin_variant: with-kube-router
-kubernetes_network_plugin_version: 0.4.0
-
-kubernetes:
-  cluster_name: chtest
-
-  dedicated_master: True
-  api_extra_sans:
-  - 178.63.180.139
-  - 178.63.180.140
-
-  pod_ip_range: 172.18.0.0/16
-  pod_ip_range_size: 24
-  service_ip_range: 172.18.192.0/18
-
-
-kubernetes_secrets:
-  encryption_config_keys: "{{ vault_kubernetes_encryption_config_keys }}"
-
-
-kubeguard:
-  ## node_index must be in the range between 1 and 190 -> 189 hosts possible
-  ##
-  ## hardcoded hostnames are not nice but if we do this via host_vars
-  ## the info is spread over multiple files and this makes it more diffcult
-  ## to find mistakes, so it is nicer to keep it in one place...
-  node_index:
-    ch-k8s-w0: 1
-    ch-k8s-w1: 2
-    ch-k8s-m0: 100
-    ch-k8s-m1: 101
-    ch-k8s-m2: 102
-
-kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
-
-kubernetes_metrics_server_version: 0.3.6
diff --git a/inventory/group_vars/lendwirbel-live/main.yml b/inventory/group_vars/lendwirbel-live/main.yml
index 43823233..37d3ec1a 100644
--- a/inventory/group_vars/lendwirbel-live/main.yml
+++ b/inventory/group_vars/lendwirbel-live/main.yml
@@ -12,8 +12,6 @@ install:
   cloud:
     credentials:
       token: "{{ vault_hcloud_api_token }}"
-  disks:
-    root_lvm_size: all
 
 network: {}
 
diff --git a/inventory/group_vars/vmhost-ch-hroottest/main.yml b/inventory/group_vars/vmhost-ch-hroottest/main.yml
deleted file mode 100644
index 84c826b1..00000000
--- a/inventory/group_vars/vmhost-ch-hroottest/main.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-vm_host:
-  name: ch-hroottest
-  network:
-    dns:
-    - 213.133.100.100
-    - 213.133.98.98
-    - 213.133.99.99
-    bridges:
-      public:
-        prefix: 192.168.250.0/24
-        offsets:
-          ch-hroottest-vm1: 100
-          ch-hroottest-obsd: 101
-          ch-k8s-m2: 200
-          ch-k8s-w0: 210
-          ch-k8s-w1: 211
-          ch-hroottest: 254
-        nat: yes
-  zfs:
-    default:
-      pool: storage
-      name: vm
-      properties:
-        compression: lz4
diff --git a/inventory/group_vars/vmhost-sk-2019vm/main.yml b/inventory/group_vars/vmhost-sk-2019vm/main.yml
index 93f7948c..254d6d8b 100644
--- a/inventory/group_vars/vmhost-sk-2019vm/main.yml
+++ b/inventory/group_vars/vmhost-sk-2019vm/main.yml
@@ -14,8 +14,6 @@ vm_host:
 #          emc-master: 137
           lw-master: 137
           ele-gwhetzner: 138
-          ch-k8s-m0: 139
-          ch-k8s-m1: 140
           ch-mimas: 142
           sk-testvm: 253
           sk-2019vm: 254
@@ -27,8 +25,6 @@ vm_host:
 #            emc-master: 1
             lw-master: 1
             ele-gwhetzner: 2
-            ch-k8s-m0: 3
-            ch-k8s-m1: 4
             ch-mimas: 6
             sk-testvm: 7
   zfs:
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index d71f38d8..84ca3962 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -5,6 +5,24 @@ install:
   efi: true
   disks:
     primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0MA04112K
+  system_lvm:
+    volumes:
+    - name: root
+      size: 30G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
+    - name: home
+      size: 200G
+      filesystem: ext4
+      mountpoint: /home
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/ch-hroottest-obsd.yml b/inventory/host_vars/ch-hroottest-obsd.yml
deleted file mode 100644
index 96ec2fe2..00000000
--- a/inventory/host_vars/ch-hroottest-obsd.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-install:
-  vm:
-    memory: 1G
-    numcpus: 1
-    autostart: True
-  disks:
-    primary: /dev/vda
-    virtio:
-      vda:
-        type: zfs
-        name: root
-        size: 10g
-  interfaces:
-  - bridge: br-public
-    name: vio0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  primary: &_network_primary_
-    name: vio0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
diff --git a/inventory/host_vars/ch-hroottest-vm1.yml b/inventory/host_vars/ch-hroottest-vm1.yml
deleted file mode 100644
index a7f45252..00000000
--- a/inventory/host_vars/ch-hroottest-vm1.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-      sdb:
-        type: zfs
-        name: data
-        size: 100g
-        properties:
-          refreservation: none
-          compression: off
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
diff --git a/inventory/host_vars/ch-hroottest.yml b/inventory/host_vars/ch-hroottest.yml
deleted file mode 100644
index 4ed4449f..00000000
--- a/inventory/host_vars/ch-hroottest.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-install:
-  cloud:
-    credentials: "{{ vault_hroot_robot_account }}"
-    server_name: "{{ host_name }}"
-  disks:
-    primary: software-raid
-    raid:
-      level: 1
-      members:
-      - /dev/sda
-      - /dev/sdb
-    root_lvm_size: 10G
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  interfaces:
-  - name: br-public
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-
-
-apt_repo_components:
-  - main
-  - contrib  ## for zfs
-  - non-free ## for microcode updates
-
-
-zfs_arc_size:
-  min: "{{ 1 * 1024 * 1024 * 1024 }}"
-  max: "{{ 4 * 1024 * 1024 * 1024 }}"
-
-zfs_zpools:
-  storage:
-    mountpoint: /srv/storage
-    create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1LS801071-part3 /dev/disk/by-id/ata-SAMSUNG_HD753LJ_S13UJ1BQ802393-part3
-
-# zfs_sanoid_modules:
-#   storage/vm:
-#     use_template: production
-#     recursive: yes
-#     process_children_only: yes
-
-docker_zfs:
-  pool: storage
-  name: docker
-  properties:
-    quota: 15G
-
-kubelet_zfs:
-  pool: storage
-  name: kubelet
-  properties:
-    quota: 15G
-
-kubernetes_version: 1.18.5
-kubernetes_container_runtime: docker
-kubernetes_standalone_max_pods: 15
-kubernetes_standalone_pod_cidr: 192.168.255.0/24
-kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-k8s-m0.yml b/inventory/host_vars/ch-k8s-m0.yml
deleted file mode 100644
index 7d81b792..00000000
--- a/inventory/host_vars/ch-k8s-m0.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 2
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-    overlay: "{{ (vm_host.network.bridges.public.overlay.prefix | ipaddr(vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
-  interfaces:
-  - *_network_primary_
-
-external_ip: "{{ network.primary.overlay }}"
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 7G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-m1.yml b/inventory/host_vars/ch-k8s-m1.yml
deleted file mode 100644
index 7d81b792..00000000
--- a/inventory/host_vars/ch-k8s-m1.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 2
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-    overlay: "{{ (vm_host.network.bridges.public.overlay.prefix | ipaddr(vm_host.network.bridges.public.overlay.offsets[inventory_hostname])).split('/')[0] }}"
-  interfaces:
-  - *_network_primary_
-
-external_ip: "{{ network.primary.overlay }}"
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 7G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-m2.yml b/inventory/host_vars/ch-k8s-m2.yml
deleted file mode 100644
index 6de6fbfb..00000000
--- a/inventory/host_vars/ch-k8s-m2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 2
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 20g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
-
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 7G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 5G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-w0.yml b/inventory/host_vars/ch-k8s-w0.yml
deleted file mode 100644
index 51095a86..00000000
--- a/inventory/host_vars/ch-k8s-w0.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 100g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
-
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 15G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 15G
-  fs: ext4
diff --git a/inventory/host_vars/ch-k8s-w1.yml b/inventory/host_vars/ch-k8s-w1.yml
deleted file mode 100644
index 51095a86..00000000
--- a/inventory/host_vars/ch-k8s-w1.yml
+++ /dev/null
@@ -1,43 +0,0 @@
----
-install:
-  vm:
-    memory: 4G
-    numcpus: 4
-    autostart: True
-  disks:
-    primary: /dev/sda
-    scsi:
-      sda:
-        type: zfs
-        name: root
-        size: 100g
-        properties:
-          refreservation: none
-  interfaces:
-  - bridge: br-public
-    name: primary0
-
-network:
-  nameservers: "{{ vm_host.network.dns }}"
-  domain: "{{ host_domain }}"
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary: &_network_primary_
-    name: primary0
-    address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}"
-  interfaces:
-  - *_network_primary_
-
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 15G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 15G
-  fs: ext4
diff --git a/inventory/host_vars/ch-mimas2.yml b/inventory/host_vars/ch-mimas2.yml
index 46fc78d2..49973cd1 100644
--- a/inventory/host_vars/ch-mimas2.yml
+++ b/inventory/host_vars/ch-mimas2.yml
@@ -4,8 +4,6 @@ install:
     credentials:
       token: "{{ vault_hcloud_api_token }}"
     server_name: "{{ host_name }}"
-  disks:
-    root_lvm_size: all
 
 network: {}
 
diff --git a/inventory/host_vars/ch-oulu.yml b/inventory/host_vars/ch-oulu.yml
index d0d035d2..e63e6f2d 100644
--- a/inventory/host_vars/ch-oulu.yml
+++ b/inventory/host_vars/ch-oulu.yml
@@ -2,13 +2,14 @@
 install:
   efi: true
   disks:
-    root_lvm_size: 15G
     primary: software-raid
     raid:
       level: 1
       members:
       - /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800161Z
       - /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_1TB_S462NF0M800191M
+  system_lvm:
+    size: 15G
 
 network:
   nameservers:
diff --git a/inventory/host_vars/ele-lt.yml b/inventory/host_vars/ele-lt.yml
index 5ef66f54..1bfcf901 100644
--- a/inventory/host_vars/ele-lt.yml
+++ b/inventory/host_vars/ele-lt.yml
@@ -3,8 +3,6 @@ install:
   cloud:
     credentials:
       token: "{{ vault_hcloud_api_token }}"
-  disks:
-    root_lvm_size: all
 
 network: {}
 
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index a8b2b162..8fe1376d 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -1,9 +1,30 @@
 ---
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
-preseed_template_name: "xubuntu-eoan-desktop-with-raid"
+preseed_template_name: "xubuntu-focal-desktop"
 
-install: {}
+install:
+  disks:
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/sda
+      - /dev/sdb
+  system_lvm:
+    volumes:
+    - name: root
+      size: 20G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/lw-telesto.yml b/inventory/host_vars/lw-telesto.yml
index 4a10338e..a225d787 100644
--- a/inventory/host_vars/lw-telesto.yml
+++ b/inventory/host_vars/lw-telesto.yml
@@ -1,9 +1,30 @@
 ---
 base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
 
-preseed_template_name: "xubuntu-eoan-desktop-with-raid"
+preseed_template_name: "xubuntu-focal-desktop"
 
-install: {}
+install:
+  disks:
+    primary: software-raid
+    raid:
+      level: 1
+      members:
+      - /dev/sda
+      - /dev/sdb
+  system_lvm:
+    volumes:
+    - name: root
+      size: 20G
+      filesystem: ext4
+      mountpoint: /
+    - name: var+log
+      size: 768M
+      filesystem: ext4
+      mountpoint: /var/log
+      mount_options:
+      - noatime
+      - nodev
+      - noexec
 
 network:
   nameservers:
diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml
index 353fe8c1..23dbbc15 100644
--- a/inventory/host_vars/sk-2019.yml
+++ b/inventory/host_vars/sk-2019.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 20G
+  system_lvm:
+    size: 20G
 
 network: {}
 
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index e989d37e..a131189c 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 10G
+  system_lvm:
+    size: 10G
 
 network:
   nameservers: "{{ vm_host.network.dns }}"
diff --git a/inventory/host_vars/sk-cloudia/vars.yml b/inventory/host_vars/sk-cloudia/vars.yml
index f8167017..0e4e1340 100644
--- a/inventory/host_vars/sk-cloudia/vars.yml
+++ b/inventory/host_vars/sk-cloudia/vars.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 15G
+  system_lvm:
+    size: 15G
 
 network: {}
 
diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml
index 3702bd54..410a1d29 100644
--- a/inventory/host_vars/sk-tomnext.yml
+++ b/inventory/host_vars/sk-tomnext.yml
@@ -10,7 +10,8 @@ install:
       members:
       - /dev/nvme0n1
       - /dev/nvme1n1
-    root_lvm_size: 10G
+  system_lvm:
+    size: 10G
 
 network:
   nameservers: "{{ vm_host.network.dns }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index bd6add33..5d19bee4 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -25,16 +25,12 @@ ch-router-obsd host_name=router
 ch-gw-lan host_name=gw-lan
 ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump
 ch-nic host_name=nic
-ch-hroottest host_name=hroot-test
-ch-hroottest-vm1 host_name=hroot-test-vm1
-ch-hroottest-obsd host_name=hroot-test-obsd
 ch-oulu host_name=oulu host_domain=helsinki.at
 
 [chaos-at-home:children]
 mz-chaos-at-home
 chaos-at-home-switches
 chaos-at-home-ap
-chaos-at-home-k8s
 
 [mz-chaos-at-home]
 mz-router ansible_host=chmz-router
@@ -56,13 +52,6 @@ ch-ap1 host_name=ap1
 ch-router
 ch-pan
 
-[chaos-at-home-k8s]
-ch-k8s-m0 host_name=k8s-master0
-ch-k8s-m1 host_name=k8s-master1
-ch-k8s-m2 host_name=k8s-master2
-ch-k8s-w0 host_name=k8s-worker0
-ch-k8s-w1 host_name=k8s-worker1
-
 
 [realraum:vars]
 host_domain=realraum.at
@@ -218,7 +207,6 @@ chaos-at-home-switches
 
 [openbsd]
 ch-router-obsd
-ch-hroottest-obsd
 
 
 ## virtualization
@@ -243,22 +231,11 @@ 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
-ch-k8s-m[0:1]
 emc-master
 lw-master
 [vmhost-sk-2019vm]
@@ -278,14 +255,12 @@ 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
 
@@ -296,7 +271,6 @@ sk-2019
 sk-cloudia
 sk-2019vm
 sk-tomnext
-ch-hroottest
 
 [hcloud]
 ch-mimas2
@@ -313,8 +287,6 @@ emc-master
 lw-master
 sk-testvm
 sk-torrent
-ch-hroottest-vm1
-ch-hroottest-obsd
 
 [hetzner:children]
 hroot
@@ -351,14 +323,12 @@ k8s-emc
 [kubernetes-cluster:children]
 k8s-emc
 k8s-lwl
-k8s-chtest
 
 [standalone-kubelet]
 sk-cloudia
 ele-thetys
 lw-thetys
 sk-tomnext-nc
-ch-hroottest
 
 [kubernetes:children]
 kubernetes-cluster
@@ -406,15 +376,3 @@ k8s-lwl-master
 k8s-lwl-encoder
 k8s-lwl-distribution
 k8s-lwl-streamer
-
-
-### Kubernetes Cluster: ch-test
-[k8s-chtest-master]
-ch-k8s-m[0:2]
-
-[k8s-chtest-worker]
-ch-k8s-w[0:1]
-
-[k8s-chtest:children]
-k8s-chtest-master
-k8s-chtest-worker