13 files changed, 58 insertions, 113 deletions
diff --git a/chaos-at-home/atlas.yml b/chaos-at-home/ch-atlas.yml
index aad91ff0..dc7ef545 100644
--- a/chaos-at-home/atlas.yml
+++ b/chaos-at-home/ch-atlas.yml
@@ -1,6 +1,6 @@
 ---
 - name: Basic Setup
-  hosts: atlas
+  hosts: ch-atlas
   roles:
   - role: sshd
   - role: zsh
diff --git a/chaos-at-home/k8s-test2.yml b/chaos-at-home/ch-keyserver.yml
index 96437893..677995ba 100644
--- a/chaos-at-home/k8s-test2.yml
+++ b/chaos-at-home/ch-keyserver.yml
@@ -1,6 +1,6 @@
 ---
 - name: Basic Setup
-  hosts: k8s-test2
+  hosts: ch-keyserver
   roles:
   - role: base
   - role: sshd
diff --git a/chaos-at-home/host_vars/mimas2.yml b/chaos-at-home/host_vars/mimas2.yml
deleted file mode 100644
index 08e7793e..00000000
--- a/chaos-at-home/host_vars/mimas2.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-$ANSIBLE_VAULT;1.2;AES256;chaos-at-home
-65316635306432313731613863383365656239313833326239383466303939666338633436646139
-3138633330343837633666326633623035306563333637630a633965373238326661346363323334
-35343462326434346431623863363031363633646366306565376639393031393466393164613766
-3539303037616664370a323136633631666438393933376437666165626632373031323264656437
-64323931663331323430306464373139393164326362323037376334623438326361643834306438
-64633864323765356330653836636234666661366462636331653664373266366366303761336562
-61343465333662353165373737383566393637393364383564343262366630636661666234376466
-36626434333835643538616536613232336631613161313332616632373531386162366666353230
-3665
diff --git a/chaos-at-home/k8s-test.yml b/chaos-at-home/k8s-test.yml
deleted file mode 100644
index e0a6c2c4..00000000
--- a/chaos-at-home/k8s-test.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: prepare hetzner hosts
-  hosts: k8s_test:&hetzner
-  roles:
-  - role: slim/hetzner
-
-- name: prepare hetzner hosts
-  hosts: k8s_test:&scaleway
-  roles:
-  - role: slim/scaleway
-
-- name: Basic Setup
-  hosts: k8s_test
-  roles:
-  - role: base
-  - role: sshd
-  - role: zsh
-  - role: admin-user
diff --git a/chaos-at-home/mimas2.yml b/chaos-at-home/mimas2.yml
deleted file mode 100644
index bfbe8e57..00000000
--- a/chaos-at-home/mimas2.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Basic Setup
-  hosts: mimas2
-  roles:
-  - role: base
-  - role: sshd
-  - role: zsh
-  - role: admin-user
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
new file mode 100644
index 00000000..7c1c26a1
--- /dev/null
+++ b/inventory/host_vars/ch-atlas.yml
@@ -0,0 +1,15 @@
+---
+vm_host:
+  installer:
+    net_if: extbr
+  network:
+    prefix: 89.106.215.29/28
+    gw: 89.106.215.30
+    prefix6: 2a02:3e0:407::29/64
+    gw6: 2a02:3e0:407::1
+    dns:
+      - 89.106.208.7
+      - 89.106.208.12
+    indices:
+      ch-keyserver: 3
+      r3-vex2: 11
diff --git a/inventory/host_vars/ch-keyserver.yml b/inventory/host_vars/ch-keyserver.yml
new file mode 100644
index 00000000..d20cbbe6
--- /dev/null
+++ b/inventory/host_vars/ch-keyserver.yml
@@ -0,0 +1,30 @@
+---
+vm_host: ch-atlas
+
+install:
+  host: "{{ vm_host }}"
+  mem: 2048
+  numcpu: 2
+  disks:
+    primary: sda
+    scsi:
+      sda:
+        vg: "{{ vm_host }}"
+        lv: "{{ inventory_hostname }}"
+        size: 10g
+  interfaces:
+  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
+    name: primary0
+  autostart: True
+
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary:
+    interface: primary0
+    ipv4:
+      addr: "{{ hostvars[vm_host].vm_host.network.ipv4.addr | ipsubnet(hostvars[vm_host].vm_host.network.ipv4.prefix) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
+      prefix: "{{ hostvars[vm_host].vm_host.network.ipv4.prefix }}"
+      gateway: "{{ hostvars[vm_host].vm_host.network.ipv4.gateway | default(hostvars[vm_host].vm_host.network.ipv4.addr) }}"
diff --git a/inventory/host_vars/pan.yml b/inventory/host_vars/ch-pan.yml
index 285f9cc1..285f9cc1 100644
--- a/inventory/host_vars/pan.yml
+++ b/inventory/host_vars/ch-pan.yml
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index b1eb90b6..2ecfe431 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -16,7 +16,7 @@ network_setup: elevate-festival
 
 
 dyndns:
-  server: pan
+  server: ch-pan
 
 
 admin_user_host:
diff --git a/inventory/host_vars/k8s-test2.yml b/inventory/host_vars/k8s-test2.yml
deleted file mode 100644
index 7ae77b77..00000000
--- a/inventory/host_vars/k8s-test2.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-vm_host: sk2016
-
-install:
-  host: "{{ vm_host }}"
-  mem: 1024
-  numcpu: 2
-  disks:
-    primary: /dev/vda
-    virtio:
-      vda:
-        vg: storage
-        lv: "{{ inventory_hostname }}"
-        size: 10g
-  interfaces:
-  - bridge: "{{ hostvars[vm_host].vm_host.network.interface }}"
-    name: primary0
-  autostart: True
-
-network:
-  nameservers: "{{ hostvars[vm_host].vm_host.network.nameservers }}"
-  domain: spreadspace.org
-  systemd_link:
-    interfaces: "{{ install.interfaces }}"
-  primary:
-    interface: primary0
-    ip: "{{ (hostvars[vm_host].vm_host.network.ip+'/'+hostvars[vm_host].vm_host.network.mask) | ipaddr(hostvars[vm_host].vm_host.network.indices[inventory_hostname]) | ipaddr('address') }}"
-    mask: "{{ hostvars[vm_host].vm_host.network.mask }}"
-    gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
-
-docker_lvm:
-  vg: "{{ host_name }}"
-  lv: docker
-  size: 3G
-  fs: ext4
-
-kubelet_lvm:
-  vg: "{{ host_name }}"
-  lv: kubelet
-  size: 1G
-  fs: ext4
diff --git a/inventory/host_vars/sk2016.yml b/inventory/host_vars/sk2016.yml
index 58ad2db9..9e4827f0 100644
--- a/inventory/host_vars/sk2016.yml
+++ b/inventory/host_vars/sk2016.yml
@@ -17,4 +17,3 @@ vm_host:
     - 213.133.99.99
     indices:
       emc-stats: 200
-      k8s-test2: 201
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index bc23b5dc..d6aa31b0 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -15,11 +15,9 @@ ansible_host={{ host_name }}.{{ host_domain }}
 ansible_port=222
 
 [chaos_at_home]
-#prometheus
-atlas ansible_port=22000
-keyserver ansible_port=22000
-pan ansible_host=ch-pan
-mimas2 ansible_host=ch-mimas2
+ch-atlas host_name=atlas
+ch-keyserver host_name=keyserver
+ch-pan host_name=pan
 ch-gnocchi host_name=gnocchi
 ch-router host_name=router
 
@@ -45,15 +43,6 @@ ch-ap0 host_name=ap0
 ch-ap1 host_name=ap1
 
 
-[k8s_test:vars]
-env_group=chaos-at-home
-
-[k8s_test]
-k8s-test0
-k8s-test1
-k8s-test2
-
-
 ###############################
 # environment: spreadspace
 
@@ -150,10 +139,9 @@ ele_infobeamer
 chaos_at_home_switches
 
 [kvmhosts]
-#prometheus
-atlas
 sk2013
 sk2016
+ch-atlas
 ch-gnocchi
 
 [hroot]
@@ -163,14 +151,11 @@ sk-cloudia
 
 [hcloud]
 emc-00
-mimas2
 ele-lt
 
 [hetzner]
 emc-stats
 emc-master
-k8s-test0
-k8s-test2
 
 [hetzner:children]
 emc_xx
@@ -180,7 +165,6 @@ hcloud
 [scaleway_kernel]
 
 [scaleway]
-k8s-test1
 
 [scaleway:children]
 scaleway_kernel
@@ -226,15 +210,3 @@ k8s_emc_stats
 [elevate_festival:children]
 elevate
 k8s_emc
-
-
-### kubernetes cluster: chaos
-[k8s_chaos_master]
-k8s-test0
-
-[k8s_chaos_nodes]
-k8s-test[1:2]
-
-[k8s_chaos:children]
-k8s_chaos_master
-k8s_chaos_nodes
diff --git a/roles/debian-installer/defaults/main.yml b/roles/debian-installer/defaults/main.yml
index 94e8d6c2..448d923e 100644
--- a/roles/debian-installer/defaults/main.yml
+++ b/roles/debian-installer/defaults/main.yml
@@ -5,6 +5,12 @@ distros:
       - amd64
       - i386
 
+  - distro: debian
+    codename: buster
+    arch:
+      - amd64
+      - i386
+
   - distro: ubuntu
     codename: bionic
     arch: