diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-24 16:16:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-24 16:16:39 +0000 |
| commit | f29966ddead2ba5f97d385108e19d1889cc7b48e (patch) | |
| tree | e50bb15cc7c9682184e879e05f47565c4e7f1ec1 /mcp/config/states/maas | |
| parent | be45e3157fe19b8905e3a30f7f839a728a6c6df7 (diff) | |
| parent | 96019123adad087bc0d744a6785ceebb7b21476d (diff) | |
Merge "[maas] Adopt maas.machines.storage"
Diffstat (limited to 'mcp/config/states/maas')
| -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 |