4 files changed, 17 insertions, 3 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index 780edbd81..ad1b8a7ab 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -8,6 +8,9 @@ virtual:
   nodes:
     - cfg01
     - mas01
+  cfg01:
+    vcpus: 4
+    ram: 6144
   mas01:
     vcpus: 4
-    ram: 16384
+    ram: 6144
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index 6e55038fc..c5820be09 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -9,6 +9,9 @@ virtual:
   nodes:
     - cfg01
     - mas01
+  cfg01:
+    vcpus: 4
+    ram: 6144
   mas01:
     vcpus: 4
-    ram: 16384
+    ram: 6144
diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
index 2d5339068..20d9107ca 100644
--- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
@@ -9,6 +9,9 @@ virtual:
   nodes:
     - cfg01
     - mas01
+  cfg01:
+    vcpus: 4
+    ram: 6144
   mas01:
     vcpus: 4
-    ram: 16384
+    ram: 6144
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 0d733bafa..e1ffa8733 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -28,6 +28,7 @@ function maas_fixup() {
   for node_system_id in ${fcnodes}; do
     salt -C 'mas01*' state.apply maas.machines.delete \
       pillar="{'system_id': '${node_system_id}'}"
+    sleep 30
   done
   if [ -n "${fcnodes}" ]; then
     salt -C 'mas01*' state.apply maas.machines
@@ -40,6 +41,7 @@ function maas_fixup() {
   for node_system_id in ${fdnodes}; do
     salt -C 'mas01*' state.apply maas.machines.mark_broken_fixed \
       pillar="{'system_id': '${node_system_id}'}"
+    sleep 30
   done
   if [ -n "${fdnodes}" ]; then
     salt -C 'mas01*' state.apply maas.machines.deploy
@@ -111,3 +113,6 @@ wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp |
 
 wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
   $(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
+
+# Get the latest packages
+salt '*' pkg.upgrade refresh=False