From d19bf0a93eb0f9da0b620af144abaf93c7c9cd31 Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Tue, 22 Dec 2020 19:56:31 +0000
Subject: [PATCH] seperate out configs

* move out the maas.config to rpi4, just incase I move things around
* add asrock02 pending maachine to arrive soon
* add os-variant
---
 asrock02.config      | 24 ++++++++++++++++++++++++
 maas.config          | 21 +--------------------
 manage-maas-nodes.sh | 17 +++++++++--------
 rpi4-maas.config     | 20 ++++++++++++++++++++
 4 files changed, 54 insertions(+), 28 deletions(-)
 create mode 100644 asrock02.config
 mode change 100644 => 120000 maas.config
 create mode 100644 rpi4-maas.config

diff --git a/asrock02.config b/asrock02.config
new file mode 100644
index 0000000..f6e5752
--- /dev/null
+++ b/asrock02.config
@@ -0,0 +1,24 @@
+qemu_connection="qemu+ssh://virsh@10.0.1.251/system"
+qemu_password="seBGtkWFKZuFUFgig8NYU5uh"
+storage_path="/var/lib/libvirt/maas-images"
+
+compute="as2-maas-node"
+
+control_count=1
+control_cpus=3
+control_ram=8192
+
+node_count=11
+node_start=1
+node_cpus=2
+node_ram=4096
+
+disks+=(50)
+disks+=(20)
+disks+=(20)
+
+bridges+=("br-enp1s0")
+bridges+=("br-enp1s0.301")
+bridges+=("br-enp1s0.302")
+bridges+=("br-enp1s0.303")
+bridges+=("br-enp1s0.304")
diff --git a/maas.config b/maas.config
deleted file mode 100644
index 9bf1d57..0000000
--- a/maas.config
+++ /dev/null
@@ -1,20 +0,0 @@
-juju_version="latest/stable"
-launchpad_user="setuid"
-maas_bridge_ip="192.168.1.22"
-maas_boot_source="http://"$maas_bridge_ip":8765/maas/images/ephemeral-v3/daily/"
-maas_endpoint="http://$maas_bridge_ip:5240/MAAS"
-maas_ip_range="10.0.1"
-maas_local_proxy="http://$maas_bridge_ip:8000"
-maas_pass="openstack"
-maas_profile="admin"
-maas_system_ip="192.168.1.10"
-maas_upstream_dns="1.1.1.1 4.4.4.4 8.8.8.8"
-maas_user="maas"
-maas_version="2.4"
-maas_api_key="z9cT7jE3BhmxcXkWWN:ew5WW9QdDMg8TXVnjt:NtKgJdfgA5FVw2YT9CnaKU87wJ5fTxKa"
-no_proxy="localhost,127.0.0.1,$maas_system_ip"
-squid_proxy="http://192.168.100.10:3128"
-virsh_user="ubuntu"
-package_repository="http://$maas_bridge_ip:8765/mirror/ubuntu"
-snap_store_proxy="$squid_proxy"
-snap_store_assertions=""
diff --git a/maas.config b/maas.config
new file mode 120000
index 0000000..4a6bcca
--- /dev/null
+++ b/maas.config
@@ -0,0 +1 @@
+rpi4-maas.config
\ No newline at end of file
diff --git a/manage-maas-nodes.sh b/manage-maas-nodes.sh
index 2ad7173..72fc032 100755
--- a/manage-maas-nodes.sh
+++ b/manage-maas-nodes.sh
@@ -154,14 +154,15 @@ build_vms() {
 		done
 
 		virt-install -v --noautoconsole   \
-			--print-xml               \
-			--autostart               \
-			--boot network,hd,menu=on \
-			--video qxl,vram=256      \
-			--channel spicevmc        \
-			--name "$virt_node"       \
-			--ram "$ram"              \
-			--vcpus "$vcpus"          \
+			--print-xml                \
+			--autostart                \
+			--boot network,hd,menu=on  \
+			--video qxl,vram=256       \
+			--channel spicevmc         \
+			--name "$virt_node"        \
+			--ram "$ram"               \
+			--vcpus "$vcpus"           \
+			--os-variant "ubuntu18.04" \
 			--console pty,target_type=serial \
 			--graphics spice,clipboard_copypaste=no,mouse_mode=client,filetransfer_enable=off \
 			--cpu host-passthrough,cache.mode=passthrough  \
diff --git a/rpi4-maas.config b/rpi4-maas.config
new file mode 100644
index 0000000..ecaa484
--- /dev/null
+++ b/rpi4-maas.config
@@ -0,0 +1,20 @@
+juju_version="latest/stable"
+launchpad_user="arif-ali"
+maas_bridge_ip="192.168.1.22"
+maas_boot_source="http://"$maas_bridge_ip":8765/maas/images/ephemeral-v3/daily/"
+maas_endpoint="http://$maas_bridge_ip:5240/MAAS"
+maas_ip_range="10.0.1"
+maas_local_proxy="http://$maas_bridge_ip:8000"
+maas_pass="openstack"
+maas_profile="admin"
+maas_system_ip="192.168.1.10"
+maas_upstream_dns="1.1.1.1 4.4.4.4 8.8.8.8"
+maas_user="maas"
+maas_version="2.4"
+maas_api_key="z9cT7jE3BhmxcXkWWN:ew5WW9QdDMg8TXVnjt:NtKgJdfgA5FVw2YT9CnaKU87wJ5fTxKa"
+no_proxy="localhost,127.0.0.1,$maas_system_ip"
+squid_proxy="http://192.168.100.10:3128"
+virsh_user="ubuntu"
+package_repository="http://$maas_bridge_ip:8765/mirror/ubuntu"
+snap_store_proxy="$squid_proxy"
+snap_store_assertions=""