summaryrefslogtreecommitdiffstats
path: root/mcp/config/states
diff options
context:
space:
mode:
authorting wu <ting.wu@enea.com>2018-05-03 12:28:06 +0200
committerting wu <ting.wu@enea.com>2018-05-24 13:36:15 +0200
commit96019123adad087bc0d744a6785ceebb7b21476d (patch)
treeaa2f0d7bc242d57d9aa6b294e9da00c3c3ccebd6 /mcp/config/states
parentb9da44077a589ac8debf12d86d8aefe4be5dc84e (diff)
[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>
Diffstat (limited to 'mcp/config/states')
-rwxr-xr-xmcp/config/states/maas11
1 files changed, 1 insertions, 10 deletions
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