diff options
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 6 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 9219b3276..4948a504d 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 81a546266..bcb780738 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 |