diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-25 17:10:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-25 17:10:43 +0000 |
| commit | 996a8a8518d5e3baf72b7882112f4a15c184b5eb (patch) | |
| tree | 22b40a6cdba30bb0cbce0e0860e59249a30ed631 /mcp/config/states | |
| parent | f63c58f98b6ddbf64f300ed0495be3dd88e242e0 (diff) | |
| parent | 79ff9f34a9e6ccdc1ca33fe58ff6b0bb565b22ac (diff) | |
Merge "[maas] Adopt maas.machines.storage" into stable/fraser
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/maas | 11 |
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 |