From 79ff9f34a9e6ccdc1ca33fe58ff6b0bb565b22ac Mon Sep 17 00:00:00 2001
From: ting wu <ting.wu@enea.com>
Date: Thu, 3 May 2018 12:28:06 +0200
Subject: [maas] Adopt maas.machines.storage

Replace MAAS CLI set_disk_layout with the
new maas.machines.storage state

JIRA: FUEL-364

Change-Id: I4d8cd9f473c5386ee7b32ad378ca1e02989233ca
Signed-off-by: ting wu <ting.wu@enea.com>
(cherry picked from commit 96019123adad087bc0d744a6785ceebb7b21476d)
---
 mcp/config/states/maas | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'mcp/config')

diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 10cfd01bf..ec2458234 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
-- 
cgit 1.2.3-korg