X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fmaas;h=2764067da2c2394ef3465cdabd9e7078b3772e56;hb=137d0635cc47ae2e0b86c97ee13e93bf2bf94f51;hp=f6c9f833cf611121edce3ec2cfbbec62fe78d9fe;hpb=d47339ccf86f2f3a5ddcca57339ad4e43228d556;p=fuel.git

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index f6c9f833c..2764067da 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -57,16 +57,7 @@ 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.storage
     salt -C 'mas01*' state.apply maas.machines.deploy
     return 1
   fi
@@ -87,7 +78,8 @@ if [ "${ERASE_ENV}" -gt 1 ]; then
 fi
 
 # MaaS rack/region controller, node commissioning
-salt -C 'mas01*' state.apply linux,salt,openssh,ntp
+wait_for 10.0 "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"
@@ -109,6 +101,6 @@ salt -C 'mas01*' pillar.item\
   maas:region:admin:password
 
 # Check all baremetal nodes are available
-wait_for 5.0 "(for n in ${bm_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
+wait_for 10.0 "(for n in ${bm_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
 
 wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"