[virtual] Update openstack version to pike

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

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index c3a51a8..fbddc6e 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -35,7 +35,7 @@ salt -I 'haproxy:proxy' service.restart rsyslog
 
 salt -I 'keystone:server' state.sls keystone.server -b 1
 salt -I 'keystone:server' service.restart apache2
-salt -I 'keystone:client' state.sls keystone.client
+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
@@ -45,7 +45,7 @@ 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
+wait_for 5 "salt -I 'cinder:controller' state.sls cinder -b 1"
 salt -I 'cinder:volume' state.sls cinder
 
 salt -I 'neutron:server' state.sls neutron -b 1
@@ -63,8 +63,7 @@ salt -I 'ceilometer:server' state.sls ceilometer
 salt -I 'ceilometer:agent' state.sls ceilometer
 
 salt -I 'horizon:server' state.sls horizon
-salt -I 'apache:server' state.sls apache
-salt -I 'nginx:server' state.sls nginx
+salt -I 'nginx:server' state.sls nginx,sphinx
 
 clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \
   pillar.get _param:cluster_vip_address | awk '{print $2; exit}')