aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/states/openstack_ha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 19:18:51 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-14 19:29:18 +0200
commit089585ad5370109d4c2a476b94b0017153d7713d (patch)
tree083b389c3868aae62fd63205dcb6d940d199f7ea /mcp/config/states/openstack_ha
parentca4e854f1b0eb6bfb35aa349e7d74abdd71128df (diff)
Drop infinite loops in favor of finite wait_for
While at it, fix some shellcheck warnings, and s/fgrep/grep -F/g. Change-Id: I093b7b4c196731b1ecc0c27a4111955b2e412762 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/states/openstack_ha')
-rwxr-xr-xmcp/config/states/openstack_ha5
1 files changed, 4 insertions, 1 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index e11135f43..c4c513da1 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -1,6 +1,9 @@
#!/bin/bash
set -x
+# shellcheck disable=SC1090
+source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+
salt -I 'keepalived:cluster' state.sls keepalived -b 1
salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address
@@ -43,7 +46,7 @@ salt -I 'neutron:gateway' state.sls neutron.gateway
salt -I 'nova:compute' state.sls nova
salt -I 'mongodb:server' state.sls mongodb
-while true; do sleep 5; salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin' && break; done
+wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin --eval "rs.initiate()"'
salt -C 'I@mongodb:server and *01*' state.sls mongodb