diff options
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 9 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 77063d6c8..a30f9af63 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -53,11 +53,10 @@ salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova -salt -C 'I@mongodb:server and *01*' state.sls mongodb || true -wait_for 10.0 "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 -I 'mongodb:server' state.sls mongodb - +salt -I 'redis:cluster:role:master' state.sls redis +salt -I 'redis:server' state.sls redis +salt -I 'gnocchi:server' state.sls gnocchi -b 1 +salt -I 'panko:server' state.sls panko -b 1 salt -I 'aodh:server' state.sls aodh -b 1 salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index 4c8cbcf8a..a266989a7 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -46,7 +46,9 @@ salt -I 'neutron:compute' state.sls neutron salt -I 'nova:compute' state.sls nova -wait_for 3 "salt -I 'mongodb:server' state.sls mongodb" +salt -I 'redis:server' state.sls redis +salt -I 'gnocchi:server' state.sls gnocchi +salt -I 'panko:server' state.sls panko salt -I 'aodh:server' state.sls aodh salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer |