port admin-users role to openbsd and move to core

5 files changed, 38 insertions, 3 deletions

diff --git a/inventory/group_vars/all/users.yml b/inventory/group_vars/all/users.yml
index 3d81e8f6..a30f4a0a 100644
--- a/inventory/group_vars/all/users.yml
+++ b/inventory/group_vars/all/users.yml
@@ -20,10 +20,11 @@ users:
     - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMd1se9DUnMWXjF4a770J4rl6L9zFmNKc7TzN0hsapUS bene@klapprechner
 
 
+## TODO: fix this!
 user_passwords:
   equinox: "{{ vault_equinox_password }}"
-  dan: "{{ vault_dan_password }}"
-  brt: "{{ vault_brt_password }}"
+  # dan: "{{ vault_dan_password }}"
+  # brt: "{{ vault_brt_password }}"
 
 
 ssh_key_map:
diff --git a/inventory/host_vars/ch-hroottest-obsd.yml b/inventory/host_vars/ch-hroottest-obsd.yml
new file mode 100644
index 00000000..c8af9fe1
--- /dev/null
+++ b/inventory/host_vars/ch-hroottest-obsd.yml
@@ -0,0 +1,29 @@
+---
+vm_host: ch-hroottest
+
+install:
+  host: "{{ vm_host }}"
+  mem: 1024
+  numcpu: 1
+  disks:
+    primary: /dev/vda
+    virtio:
+      vda:
+        type: zfs
+        name: root
+        size: 10g
+  interfaces:
+  - bridge: br-public
+    name: vio0
+  autostart: True
+
+network:
+  nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
+  domain: "{{ host_domain }}"
+  systemd_link:
+    interfaces: "{{ install.interfaces }}"
+  primary:
+    interface: vio0
+    ip: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr(hostvars[vm_host].vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('netmask') }}"
+    gateway: "{{ hostvars[vm_host].vm_host.network.bridges.public.prefix | ipaddr('address') }}"
diff --git a/inventory/host_vars/ch-hroottest-vm1.yml b/inventory/host_vars/ch-hroottest-vm1.yml
index 53a910e8..ccb3ca92 100644
--- a/inventory/host_vars/ch-hroottest-vm1.yml
+++ b/inventory/host_vars/ch-hroottest-vm1.yml
@@ -15,7 +15,7 @@ install:
   interfaces:
   - bridge: br-public
     name: primary0
-    autostart: True
+  autostart: True
 
 network:
   nameservers: "{{ hostvars[vm_host].vm_host.network.dns }}"
diff --git a/inventory/host_vars/ch-hroottest.yml b/inventory/host_vars/ch-hroottest.yml
index e074afbb..080f5306 100644
--- a/inventory/host_vars/ch-hroottest.yml
+++ b/inventory/host_vars/ch-hroottest.yml
@@ -43,6 +43,7 @@ vm_host:
         prefix: 192.168.250.254/24
         offsets:
           ch-hroottest-vm1: 100
+          ch-hroottest-obsd: 101
         nat: yes
   zfs:
     default:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 8e96f240..ad231374 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -26,6 +26,7 @@ ch-gw-lan host_name=gw-lan
 ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump
 ch-hroottest host_name=hroot-test
 ch-hroottest-vm1 host_name=hroot-test-vm1
+ch-hroottest-obsd host_name=hroot-test-obsd
 
 [chaos-at-home:children]
 mz-chaos-at-home
@@ -225,6 +226,7 @@ chaos-at-home-switches
 
 [openbsd]
 ch-router-obsd
+ch-hroottest-obsd
 
 
 [kvmhosts]
@@ -258,6 +260,7 @@ ele-mur
 sk-tomnext-nc
 sk-tomnext-hp
 ch-hroottest-vm1
+ch-hroottest-obsd
 
 [hroot]
 sk-2019
@@ -282,6 +285,7 @@ lw-master
 sk-testvm
 sk-torrent
 ch-hroottest-vm1
+ch-hroottest-obsd
 
 [hetzner:children]
 hroot