diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-02-19 15:17:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-02-19 15:17:25 +0000 |
| commit | 3c34bab9279d5dbe7df3824131e4487e5017ef15 (patch) | |
| tree | 2764cdfd7b9c8d597713d90b7958c6f4bbff8bf0 /mcp/config/states/maas | |
| parent | 1b2958b0695ebc9e2ba95f782b854540cea42c14 (diff) | |
| parent | 58af9a94ef78bbcf3f0593d4170d32ebce721455 (diff) | |
Merge "[baremetal] Containerize MaaS"
Diffstat (limited to 'mcp/config/states/maas')
| -rwxr-xr-x | mcp/config/states/maas | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 47f66a451..28ef4cae0 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -17,6 +17,8 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \ awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); printf "%s ", $1}') +wait_for 60.0 "salt --out yaml -C 'mas01*' service.status maas-fixup | fgrep -q 'false'" + # Optionally destroy MaaS machines from a previous run if [ "${ERASE_ENV}" -gt 1 ]; then cleanup_uefi @@ -26,7 +28,7 @@ if [ "${ERASE_ENV}" -gt 1 ]; then fi # MaaS rack/region controller, node commissioning -wait_for 10.0 "salt -C 'mas01*' state.apply linux,salt,openssh,ntp,iptables" +wait_for 10.0 "salt -C 'mas01*' state.apply salt,iptables" salt -C 'mas01*' state.apply maas.cluster wait_for 10 "salt -C 'mas01*' state.apply maas.region" |