Merge branch 'topic/openbsd-test'

5 files changed, 38 insertions, 1 deletions

diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml
index 73aa2975..28a29081 100644
--- a/inventory/group_vars/chaos-at-home/network.yml
+++ b/inventory/group_vars/chaos-at-home/network.yml
@@ -43,6 +43,7 @@ network_zones:
       ch-stats: 10
       ch-web: 80
       ch-mail: 143
+      ch-router-obsd: 253
       ch-router: 254
 
   mgmt:
diff --git a/inventory/group_vars/kvmhosts/main.yml b/inventory/group_vars/kvmhosts/main.yml
index eef2a639..917b41eb 100644
--- a/inventory/group_vars/kvmhosts/main.yml
+++ b/inventory/group_vars/kvmhosts/main.yml
@@ -1,3 +1,2 @@
 ---
-preseed_path: /srv/preseed
 installer_path: /srv/installer
diff --git a/inventory/group_vars/openbsd/main.yml b/inventory/group_vars/openbsd/main.yml
new file mode 100644
index 00000000..913008d0
--- /dev/null
+++ b/inventory/group_vars/openbsd/main.yml
@@ -0,0 +1,2 @@
+---
+ansible_python_interpreter: /usr/local/bin/python3.7
diff --git a/inventory/host_vars/ch-router-obsd.yml b/inventory/host_vars/ch-router-obsd.yml
new file mode 100644
index 00000000..a88110f3
--- /dev/null
+++ b/inventory/host_vars/ch-router-obsd.yml
@@ -0,0 +1,28 @@
+---
+vm_host: ch-gnocchi
+
+install:
+  host: "{{ vm_host }}"
+  mem: 512
+  numcpu: 1
+  disks:
+    primary: /dev/sda
+    virtio:
+      vda:
+        type: lvm
+        vg: "{{ hostvars[vm_host].host_name }}"
+        lv: "{{ inventory_hostname }}"
+        size: 10g
+  interfaces:
+  - bridge: br-svc
+    name: vio0
+  autostart: True
+
+network:
+  nameservers: "{{ network_zones.svc.dns }}"
+  domain: "{{ host_domain }}"
+  primary:
+    interface: vio0
+    ip: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ network_zones.svc.prefix | ipaddr('netmask') }}"
+    gateway: "{{ network_zones.svc.gateway }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index e6c3cc97..3892abbe 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -21,6 +21,7 @@ ch-testvm host_name=testvm
 ch-mimas2 host_name=mimas
 ch-gnocchi host_name=gnocchi
 ch-router host_name=router
+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
 
@@ -179,6 +180,10 @@ r3-cccamp19-sw0
 chaos-at-home-switches
 
 
+[openbsd]
+ch-router-obsd
+
+
 [kvmhosts]
 ch-atlas
 ch-gnocchi
@@ -193,6 +198,8 @@ ch-keyserver
 ch-testvm
 ch-gw-lan
 ch-jump
+ch-router
+ch-router-obsd
 r3-vex2
 r3-cccamp19-flora
 r3-cccamp19-verr