Revert "[baremetal] Retire mas01 NAT"

[fuel.git] / mcp / config / states / maas

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 0034e78..10cfd01 100755 (executable)
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -57,6 +57,16 @@ function maas_fixup() {
     sleep 10
   done
   if [ -n "${fdnodes}" ] || [ -n "${rnodes}" ]; then
+    for node_system_id in ${fdnodes} ${rnodes}; do
+      # For now, we allocate 30GB (fixed) for / on cmp nodes
+      local node_hostname=$(echo "${statusout}" | \
+        grep -Pzo 'hostname: \K.+(?=\n.+\n\s+system_id: '"${node_system_id}"')')
+      if [[ "${node_hostname}" =~ ^cmp ]]; then
+        salt -C 'mas01*' state.apply maas.machines.set_storage_layout \
+          pillar="{'system_id': '${node_system_id}', 'lv_size': '32212254720'}"
+        sleep 10
+      fi
+    done
     salt -C 'mas01*' state.apply maas.machines.deploy
     return 1
   fi
@@ -78,6 +88,7 @@ fi
 
 # MaaS rack/region controller, node commissioning
 salt -C 'mas01*' state.apply linux,salt,openssh,ntp
+salt -C 'mas01*' state.apply maas.pxe_nat
 salt -C 'mas01*' state.apply maas.cluster
 
 wait_for 10 "salt -C 'mas01*' state.apply maas.region"