7 files changed, 145 insertions, 33 deletions
diff --git a/inventory/group_vars/all/users.yml b/inventory/group_vars/all/users.yml
index d4ec2b5f..bc63cb24 100644
--- a/inventory/group_vars/all/users.yml
+++ b/inventory/group_vars/all/users.yml
@@ -19,6 +19,10 @@ users:
     ssh:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd1se9DUnMWXjF4a770J4rl6L9zFmNKc7TzN0hsapUS bene@klapprechner
 
+  antares:
+    ssh:
+    - "# TODO: add me"
+
 
 
 ssh_key_map:
diff --git a/inventory/group_vars/r3-cccamp19/network.yml b/inventory/group_vars/r3-cccamp19/network.yml
deleted file mode 100644
index 82216ea6..00000000
--- a/inventory/group_vars/r3-cccamp19/network.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-network_zones:
-  camp19:
-    vlan: 19
-
-  lan:
-    vlan: 126
-    prefix: 192.168.126.0/24
-    gateway: 192.168.126.254
-    dns:
-      - 192.168.126.254
-    dhcp:
-      start: 1
-      limit: 199
-    offsets:
-      r3-cccamp19-dione: 200
-      r3-cccamp19-helene: 201
-      r3-cccamp19-flora: 220
-      r3-cccamp19-verr: 221
-      r3-cccamp19-feedcode: 222
-      r3-cccamp19-av: 223
-      r3-cccamp19-gw: 254
-
-  mgmt:
-    vlan: 41
-    prefix: 192.168.41.0/24
-    offsets:
-      r3-cccamp19-dione: 100
-      r3-cccamp19-helene: 101
-      r3-cccamp19-sw0: 200
-      r3-cccamp19-sw1: 201
-      r3-cccamp19-sw2: 202
-      r3-cccamp19-gw: 254
diff --git a/inventory/group_vars/vmhost-ch-atlas/main.yml b/inventory/group_vars/vmhost-ch-atlas/main.yml
new file mode 100644
index 00000000..4b7af32f
--- /dev/null
+++ b/inventory/group_vars/vmhost-ch-atlas/main.yml
@@ -0,0 +1,25 @@
+---
+vm_host:
+  name: ch-atlas
+  network:
+    dns:
+    - 89.106.208.7
+    - 89.106.208.12
+    bridges:
+      public:
+        interfaces:
+          - eth0
+        prefix: 89.106.215.16/28
+        gateway: 89.106.215.30
+        prefix6: 2a02:3e0:407::/64
+        gateway6: 2a02:3e0:407::1
+        offsets:
+          ch-keyserver: 3
+          ch-testvm: 4
+          ele-mur: 5
+          r3-vex2: 11
+          ch-atlas: 13
+      k8stest: {}
+      funkfeuer:
+        interfaces:
+          - eth0.502
diff --git a/inventory/group_vars/vmhost-ch-gnocchi/main.yml b/inventory/group_vars/vmhost-ch-gnocchi/main.yml
new file mode 100644
index 00000000..5b36795e
--- /dev/null
+++ b/inventory/group_vars/vmhost-ch-gnocchi/main.yml
@@ -0,0 +1,25 @@
+---
+__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/group_vars/vmhost-ch-hroottest/main.yml b/inventory/group_vars/vmhost-ch-hroottest/main.yml
new file mode 100644
index 00000000..84c826b1
--- /dev/null
+++ b/inventory/group_vars/vmhost-ch-hroottest/main.yml
@@ -0,0 +1,25 @@
+---
+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
new file mode 100644
index 00000000..93f7948c
--- /dev/null
+++ b/inventory/group_vars/vmhost-sk-2019vm/main.yml
@@ -0,0 +1,39 @@
+---
+vm_host:
+  name: sk-2019vm
+  network:
+    dns:
+    - 213.133.100.100
+    - 213.133.98.98
+    - 213.133.99.99
+    bridges:
+      public:
+        prefix: 192.168.250.0/24
+        offsets:
+          sk-torrent: 136
+#          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
+        nat: yes
+        overlay:
+          prefix: 178.63.180.136/29
+          offsets:
+            sk-torrent: 0
+#            emc-master: 1
+            lw-master: 1
+            ele-gwhetzner: 2
+            ch-k8s-m0: 3
+            ch-k8s-m1: 4
+            ch-mimas: 6
+            sk-testvm: 7
+  zfs:
+    default:
+      pool: storage
+      name: vm
+      properties:
+        compression: lz4
diff --git a/inventory/group_vars/vmhost-sk-tomnext/main.yml b/inventory/group_vars/vmhost-sk-tomnext/main.yml
new file mode 100644
index 00000000..eacc58a2
--- /dev/null
+++ b/inventory/group_vars/vmhost-sk-tomnext/main.yml
@@ -0,0 +1,27 @@
+---
+vm_host:
+  name: sk-tomnext
+  network:
+    dns:
+    - 213.133.100.100
+    - 213.133.98.98
+    - 213.133.99.99
+    bridges:
+      public:
+        prefix: 192.168.250.0/24
+        offsets:
+          sk-tomnext-nc: 103
+          sk-tomnext-hp: 104
+          sk-tomnext: 254
+        nat: yes
+        overlay:
+          prefix: 94.130.206.64/26
+          offsets:
+            sk-tomnext-nc: 39
+            sk-tomnext-hp: 40
+  zfs:
+    default:
+      pool: storage
+      name: vm
+      properties:
+        compression: lz4