aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmcp/config/states/openstack_ha6
-rwxr-xr-xmcp/config/states/openstack_noha2
2 files changed, 4 insertions, 4 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 9219b32..4948a50 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -53,10 +53,10 @@ salt -I 'neutron:gateway' state.sls neutron.gateway
salt -I 'nova:compute' state.sls nova
-salt -I 'mongodb:server' state.sls mongodb || true
-wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
+salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
+wait_for 10 "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
+salt -I 'mongodb:server' state.sls mongodb
salt -I 'aodh:server' state.sls aodh -b 1
salt -I 'ceilometer:server' state.sls ceilometer
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 81a5462..bcb7807 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -45,7 +45,7 @@ salt -I 'neutron:server' state.sls neutron
salt -I 'nova:compute' state.sls nova
-salt -I 'mongodb:server' state.sls mongodb || salt -I 'mongodb:server' state.sls mongodb
+wait_for 3 "salt -I 'mongodb:server' state.sls mongodb"
salt -I 'aodh:server' state.sls aodh
salt -I 'ceilometer:server' state.sls ceilometer
salt -I 'ceilometer:agent' state.sls ceilometer