From 354c6b84ab20253c530fb2b57cc86e899f46a1c5 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 28 May 2023 23:09:36 -0400
Subject: [PATCH] Set up bhyve for mrmanager.

---
 ansible/environments/colo/host_vars/mrmanager     |  5 ++---
 .../jail/host_vars/mrmanager_nat_dhcp             |  1 +
 .../roles/bhyve/files/bhyve_netgraph_bridge.bash  |  6 ++++++
 ansible/roles/bhyve/tasks/freebsd.yaml            | 15 ---------------
 ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf  |  5 +++++
 5 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 ansible/environments/jail/host_vars/mrmanager_nat_dhcp

diff --git a/ansible/environments/colo/host_vars/mrmanager b/ansible/environments/colo/host_vars/mrmanager
index 80f9617..ed468c3 100644
--- a/ansible/environments/colo/host_vars/mrmanager
+++ b/ansible/environments/colo/host_vars/mrmanager
@@ -23,8 +23,7 @@ jail_list:
     enabled: true
     conf:
       src: nat_dhcp
-# bhyve_dataset: zroot/freebsd/release/vm
-# bhyve_list: []
-# bhyve_canmount: "on"
+bhyve_dataset: zdata/vm
+bhyve_canmount: "on"
 # efi_dev: /dev/gpt/EFI
 devfs_rules: "mrmanager_devfs.rules"
diff --git a/ansible/environments/jail/host_vars/mrmanager_nat_dhcp b/ansible/environments/jail/host_vars/mrmanager_nat_dhcp
new file mode 100644
index 0000000..1d0b6d9
--- /dev/null
+++ b/ansible/environments/jail/host_vars/mrmanager_nat_dhcp
@@ -0,0 +1 @@
+os_flavor: "freebsd"
diff --git a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash
index e6985cd..fdf8013 100644
--- a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash
+++ b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash
@@ -15,6 +15,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # Enable Sound
 # bhyve_options="-s 16,hda,play=/dev/dsp,rec=/dev/dsp"
 
+# Example usage:
+#
+#   doas bhyve_netgraph_bridge create-disk zdata/vm/poudriere /vm/poudriere 10
+#   doas bhyve_netgraph_bridge start poudriere zdata/vm/poudriere /vm/poudriere jail_nat 10.215.1.1/24 /vm/iso/FreeBSD-13.2-RELEASE-amd64-bootonly.iso
+#   doas bhyve_netgraph_bridge start poudriere zdata/vm/poudriere /vm/poudriere jail_nat 10.215.1.1/24
+
 function main {
     if [ "$1" = "create-disk" ]; then
         shift 1
diff --git a/ansible/roles/bhyve/tasks/freebsd.yaml b/ansible/roles/bhyve/tasks/freebsd.yaml
index 96ba2ba..363475c 100644
--- a/ansible/roles/bhyve/tasks/freebsd.yaml
+++ b/ansible/roles/bhyve/tasks/freebsd.yaml
@@ -31,18 +31,3 @@
       mountpoint: "{{ bhyve_mountpoint }}"
       canmount: "{{ bhyve_canmount|default('noauto') }}"
       "ta:bemount": "{{ bhyve_bemount|default('on') }}"
-
-- name: Enable bhyve
-  community.general.sysrc:
-    name: "{{ item.name }}"
-    value: "{{ item.value }}"
-    path: /etc/rc.conf.d/vm
-  loop:
-    - name: vm_enable
-      value: "YES"
-    - name: vm_dir
-      value: "zfs:{{ bhyve_dataset }}"
-    - name: vm_list
-      value: "{{ bhyve_list|community.general.json_query('[?enabled==`true`].name')|join(' ') }}"
-    - name: vm_delay
-      value: "5"
diff --git a/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf b/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf
index d39ed58..5706e53 100644
--- a/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf
+++ b/ansible/roles/jail_nat_dhcp/files/kea-dhcp4.conf
@@ -23,6 +23,11 @@
                         // unifi controller
                         "hw-address": "06:40:9f:d7:be:a6",
                         "ip-address": "10.215.1.202"
+                    },
+                    {
+                        // poudriere
+                        "hw-address": "06:8f:24:d6:21:24",
+                        "ip-address": "10.215.1.203"
                     }
                 ]
             }