From 0f9b5154d0aa24e905ad550d38f5db34df6c7e48 Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Fri, 25 Dec 2020 18:43:13 +0000
Subject: [PATCH] Update second machine details, and finalise runcmd

---
 asrock02.config   | 22 ++++++++++++++++++++--
 hypervisor.config |  2 +-
 user-data.yaml    |  7 +++++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/asrock02.config b/asrock02.config
index 3089d8e..95e63c4 100644
--- a/asrock02.config
+++ b/asrock02.config
@@ -1,5 +1,12 @@
-qemu_connection="qemu+ssh://virsh@10.0.1.251/system"
-qemu_password="FPEW2H2hc2ot.HNinxpgGIGM88DI2be7"
+hypervisor_name=asrock02
+hypervisor_ip=10.0.1.251
+hypervisor_mac="a8:a1:59:44:76:79"
+
+external_vlan=1
+
+qemu_connection="qemu+ssh://virsh@${hypervisor_ip}/system"
+qemu_password="SgUoBByKjG9Lj78SwfWAHXD8DvgE67Cu"
+
 storage_path="/var/lib/libvirt/maas-images"
 
 compute="as2-maas-node"
@@ -20,9 +27,20 @@ disks+=(20)
 
 network_type=bridge
 
+vlans=()
+vlans+=(300)
+vlans+=(301)
+vlans+=(302)
+vlans+=(303)
+vlans+=(304)
+vlans+=(305)
+vlans+=(1)
+
 bridges=()
 bridges+=("br0")
 bridges+=("br1")
 bridges+=("br2")
 bridges+=("br3")
 bridges+=("br4")
+bridges+=("br5")
+bridges+=("br6")
diff --git a/hypervisor.config b/hypervisor.config
index fd62d6c..b08188e 120000
--- a/hypervisor.config
+++ b/hypervisor.config
@@ -1 +1 @@
-asrock01.config
\ No newline at end of file
+asrock02.config
\ No newline at end of file
diff --git a/user-data.yaml b/user-data.yaml
index 3dae918..853d268 100644
--- a/user-data.yaml
+++ b/user-data.yaml
@@ -30,6 +30,7 @@ write_files:
   content: |
     #!/bin/bash
 
+    # Enable SSH, so that virsh can login
     sed -i "s/^\(PasswordAuthentication\).*/\1 yes/g" /etc/ssh/sshd_config
     systemctl restart sshd
 
@@ -44,5 +45,7 @@ write_files:
 
 # Runs any command that we need to run post install
 runcmd:
-- [ "/root/initial_setup.sh" ]
-- [ "efibootmgr", "-n", "0001"]
+  - [ "efibootmgr", "-n", "0001"]
+  - [ "groupmod", "-g", "117", "libvirt" ]
+  - [ "groupmod", "-g", "64055", "libvirt-qemu" ]
+  - [ "/root/initial_setup.sh" ]