From f617c3eebbf839279c0604f1873feaa6c18b7d81 Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Wed, 30 Dec 2020 07:59:12 +0000
Subject: [PATCH] Reorder some IPs, update api key, and add start/end for dhcp

---
 bootstrap-maas.sh        | 2 +-
 configs/asrock01.config  | 2 +-
 configs/asrock02.config  | 2 +-
 configs/asrock03.config  | 2 +-
 configs/rpi4-maas.config | 6 ++++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/bootstrap-maas.sh b/bootstrap-maas.sh
index 886c87c..4f20403 100755
--- a/bootstrap-maas.sh
+++ b/bootstrap-maas.sh
@@ -171,7 +171,7 @@ build_maas() {
         maas ${maas_profile} interface update ${maas_system_id} ${maas_int_id} vlan=${vlan_id}
 
         if [[ $space != "external" ]] ; then
-            maas ${maas_profile} ipranges create type=dynamic start_ip="${maas_subnets[$i]}.101" end_ip="${maas_subnets[$i]}.199"
+            maas ${maas_profile} ipranges create type=dynamic start_ip="${maas_subnets[$i]}.${maas_dhcp_start_postfix}" end_ip="${maas_subnets[$i]}.${maas_dhcp_end_postfix}"
             maas $maas_profile vlan update fabric-0 ${maas_vlans[$i]} dhcp_on=True primary_rack="$maas_system_id"
 
             # Force MAAS to manage all subnets except for external
diff --git a/configs/asrock01.config b/configs/asrock01.config
index 0f236ab..4679a78 100644
--- a/configs/asrock01.config
+++ b/configs/asrock01.config
@@ -1,5 +1,5 @@
 hypervisor_name=asrock01
-hypervisor_ip=10.0.1.253
+hypervisor_ip=10.0.1.241
 hypervisor_mac="a8:a1:59:44:70:ac"
 
 external_ip=192.168.1.211
diff --git a/configs/asrock02.config b/configs/asrock02.config
index f5aa3e9..4c8dc9c 100644
--- a/configs/asrock02.config
+++ b/configs/asrock02.config
@@ -1,5 +1,5 @@
 hypervisor_name=asrock02
-hypervisor_ip=10.0.1.251
+hypervisor_ip=10.0.1.242
 hypervisor_mac="a8:a1:59:44:76:79"
 
 external_ip=192.168.1.212
diff --git a/configs/asrock03.config b/configs/asrock03.config
index 5822ce4..90e7d2a 100644
--- a/configs/asrock03.config
+++ b/configs/asrock03.config
@@ -1,5 +1,5 @@
 hypervisor_name=asrock03
-hypervisor_ip=10.0.1.250
+hypervisor_ip=10.0.1.243
 hypervisor_mac=""
 
 external_ip=192.168.1.213
diff --git a/configs/rpi4-maas.config b/configs/rpi4-maas.config
index f59f47e..3fa68f4 100644
--- a/configs/rpi4-maas.config
+++ b/configs/rpi4-maas.config
@@ -1,7 +1,7 @@
 juju_version="latest/stable"
 juju_ha="false"
 launchpad_user="arif-ali"
-maas_bridge_ip="10.0.1.200"
+maas_bridge_ip="10.0.1.253"
 maas_boot_source="http://192.168.1.161/maas/images/ephemeral-v3/stable/"
 maas_endpoint="http://$maas_bridge_ip:5240/MAAS"
 maas_ip_range="10.0.1"
@@ -12,9 +12,11 @@ maas_upstream_dns="192.168.1.13"
 maas_user="admin"
 maas_version="2.9"
 maas_pkg_type="snap"
-maas_api_key="XzhM34n6kxWpZ9J3gB:bkBtU32erksmTCbMjH:eeHzXXfTUStjpzGbXeAND7dnQwA2WVk4"
+maas_api_key="BLeLFyaDHeEHMfVzpB:HK9E2XkwUud8T2FFPz:3SxCCMrdRXAENnKqPrK7AXg6NjgtM8w6"
 maas_subnet_start="10.0.1.101"
 maas_subnet_end="10.0.1.199"
+maas_dhcp_start_postfix="101"
+maas_dhcp_end_postfix="199"
 maas_spaces=(oam ceph-access ceph-replica overlay admin internal external)
 maas_subnets=(10.0.1 10.0.2 10.0.3 10.0.4 10.0.5 10.0.6 192.168.1 )
 maas_vlans=(300 301 302 303 304 305 1)