From 400484e503fda63d770b29fb4ba425f34956b446 Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Mon, 20 Dec 2021 02:37:48 +0000
Subject: [PATCH] Further updates

* Add extra bootstrap flags, will need to parametrise these at some point
* ensure nodes are tagged when they are newly created
* assign the same ip suffix on the hypervisors for consistency
---
 bootstrap-maas.sh          | 7 +++++--
 configs/rpi4-maas.config   | 1 +
 manage-hypervisor-nodes.sh | 6 ++++--
 manage-vm-nodes.sh         | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bootstrap-maas.sh b/bootstrap-maas.sh
index 32d91ed..087724c 100755
--- a/bootstrap-maas.sh
+++ b/bootstrap-maas.sh
@@ -327,7 +327,7 @@ EOF
 cat > config-"$rand_uuid".yaml <<EOF
 automatically-retry-hooks: true
 mongo-memory-profile: default
-default-series: bionic
+default-series: $juju_bootstrap_series
 transmit-vendor-metrics: false
 EOF
 
@@ -354,7 +354,10 @@ fi
     echo "Details for cloud.......: $cloud_name..."
     juju clouds --local --format json | jq --arg cloud "$cloud_name" '.[$cloud]'
 
-    juju bootstrap "$cloud_name" --debug --config=config-"$rand_uuid".yaml --constraints "tags=juju"
+    juju bootstrap "$cloud_name" --debug --config=config-"$rand_uuid".yaml \
+        --model-default image-metadata-url=http://192.168.1.12/lxd/ \
+        --model-default agent-metadata-url=http://192.168.1.12/juju/tools/ \
+        --constraints "tags=juju"
 
     # Since we created ephemeral files, let's wipe them out. Comment if you want to keep them around
     if [[ $? = 0 ]]; then
diff --git a/configs/rpi4-maas.config b/configs/rpi4-maas.config
index 560dc99..4443d99 100644
--- a/configs/rpi4-maas.config
+++ b/configs/rpi4-maas.config
@@ -1,5 +1,6 @@
 juju_version="2.8/stable"
 juju_ha="true"
+juju_bootstrap_series="focal"
 launchpad_user="arif-ali"
 package_repository="http://192.168.1.12/archive.ubuntu.com/ubuntu/"
 maas_bridge_ip="10.0.1.253"
diff --git a/manage-hypervisor-nodes.sh b/manage-hypervisor-nodes.sh
index c306d58..fc4a24b 100755
--- a/manage-hypervisor-nodes.sh
+++ b/manage-hypervisor-nodes.sh
@@ -20,9 +20,10 @@ maas_assign_networks()
     i=0
     for vlan in ${vlans[*]}
     do
-        subnet_line=$(maas admin subnets read | jq -rc --arg vlan "$vlan" ".[] | select(.vlan.vid == $vlan) | select(.name | contains(\"/24\"))| {subnet_id:.id, vlan_id:.vlan.id}")
+        subnet_line=$(maas admin subnets read | jq -rc --arg vlan "$vlan" ".[] | select(.vlan.vid == $vlan) | select(.name | contains(\"/24\"))| {subnet_id:.id, vlan_id:.vlan.id, cidr: .cidr}")
         maas_vlan_id=$(echo $subnet_line | jq .vlan_id | sed s/\"//g)
         maas_subnet_id=$(echo $subnet_line | jq .subnet_id | sed s/\"//g)
+        sub_prefix=$(echo $subnet_line | jq .cidr | sed s/\"//g | sed 's/0\/24//g' )
         ip_addr=""
         if [[ $i -eq 0 ]] ; then
             # Set the first interface to be static as per the configuration so that it
@@ -43,7 +44,8 @@ maas_assign_networks()
                 ip_addr="ip_address=$external_ip"
             else
                 # Set everything else to be auto assigned
-                mode="AUTO"
+                mode="STATIC"
+                ip_addr="ip_address=${sub_prefix}${ip_suffix}"
             fi
         fi
         # Check to see if the bridge interface already exists, otherwise create it
diff --git a/manage-vm-nodes.sh b/manage-vm-nodes.sh
index c08b0be..3f4110b 100755
--- a/manage-vm-nodes.sh
+++ b/manage-vm-nodes.sh
@@ -515,6 +515,7 @@ while getopts ":cdjnprtwz" opt; do
   case $opt in
     c)
         create_vms
+        do_nodes tag
         ;;
     d)
         install_deps