Merge "[baremetal] Fix cmp proto dhcp on PXE/admin"

[fuel.git] / mcp / config / states / openstack_ha

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 0c1b82f..4948a50 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -22,6 +22,7 @@ salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
 salt -I 'glusterfs:server' state.sls glusterfs.server.service
 salt -I 'glusterfs:server' state.sls glusterfs.server.setup -b 1
 salt -I 'glusterfs:server' cmd.run "gluster peer status; gluster volume status" -b 1
+salt -I 'glusterfs:client' state.sls glusterfs.client
 
 salt -I 'galera:master' state.sls galera
 salt -I 'galera:slave' state.sls galera
@@ -33,30 +34,29 @@ salt -I 'haproxy:proxy' state.sls haproxy
 salt -I 'haproxy:proxy' service.status haproxy
 salt -I 'haproxy:proxy' service.restart rsyslog
 
-salt -I 'keystone:server' state.sls keystone.server -b 1
+set +e; salt -I 'keystone:server' state.sls keystone.server -b 1; set -e
 salt -I 'keystone:server' service.restart apache2
+salt -I 'keystone:server' state.sls keystone.server -b 1
+
 wait_for 30 "salt -I 'keystone:client' state.sls keystone.client"
 salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
 
 salt -I 'glance:server' state.sls glance -b 1
-salt -I 'glusterfs:client' state.sls glusterfs.client
-salt -I 'keystone:server' state.sls keystone.server
-
 salt -I 'nova:controller' state.sls nova -b 1
 salt -I 'heat:server' state.sls heat -b 1
 
-salt -I 'cinder:controller' state.sls cinder -b 1
-salt -I 'cinder:volume' state.sls cinder
+wait_for 5 "salt -I 'cinder:controller' state.sls cinder -b 1"
+wait_for 3 "salt -I 'cinder:volume' state.sls cinder"
 
 salt -I 'neutron:server' state.sls neutron -b 1
 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