diff options
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/openstack | 6 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack index 369e16504..1578dcffc 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack @@ -20,8 +20,10 @@ salt -I 'mysql:server' state.sls mysql salt -I 'memcached:server' state.sls memcached salt -I 'haproxy:proxy' state.sls haproxy -salt -I 'keystone:server' state.sls keystone.server +set +e; salt -I 'keystone:server' state.sls keystone.server; set -e salt -I 'keystone:server' service.restart apache2 +salt -I 'keystone:server' state.sls keystone.server + salt -I 'keystone:server' state.sls keystone.client salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list" @@ -41,7 +43,7 @@ salt -I 'neutron:gateway' state.sls neutron salt -I 'nova:compute' state.sls nova -salt -I 'mongodb:server' state.sls mongodb +salt -I 'mongodb:server' state.sls mongodb || 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 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index c355126f7..b08a31ce6 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -80,3 +80,6 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US # Disable proxy dhcp routes after installation salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ args='unset new_routers' +salt -C 'prx*' system.reboot +wait_for 30 "! salt -C 'prx*' test.ping | " \ + "tee /dev/stderr | grep -Fq 'Not connected'" |