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

5 files changed, 0 insertions, 77 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: