diff options
Diffstat (limited to 'mcp/config')
| -rwxr-xr-x | mcp/config/states/neutron_compute | 2 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute index 70a2db607..f1285479e 100755 --- a/mcp/config/states/neutron_compute +++ b/mcp/config/states/neutron_compute @@ -9,6 +9,6 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x -salt -I 'neutron:compute' state.sls neutron +salt -I 'neutron:compute' state.sls neutron || true salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \ args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf' diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index aada4ad45..9237cc00b 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -53,12 +53,12 @@ salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova -salt -I 'mongodb:server' state.sls mongodb +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*' cmd.run 'mongo localhost:27017/admin --eval "rs.initiate()"' salt -C 'I@mongodb:server and *01*' state.sls mongodb -salt -I 'aodh:server' state.sls aodh +salt -I 'aodh:server' state.sls aodh -b 1 salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer |