Pull out rocky patches

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

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 924dc30..72f4019 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -15,7 +15,8 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 wait_for 5.0 "salt -I 'keepalived:cluster' state.sls keepalived -b 1"
 wait_for 5.0 "salt -I 'keepalived:cluster' pillar.get keepalived:cluster:instance:VIP:address"
 
-wait_for 5.0 "salt -C 'I@rabbitmq:server and *01*' state.sls rabbitmq"
+salt -I 'rabbitmq:server' cmd.run 'mkdir -p /etc/rabbitmq && echo HOSTNAME=localhost > /etc/rabbitmq/rabbitmq-env.conf'
+wait_for 5.0 "salt -I 'rabbitmq:server:cluster:role:master' state.sls rabbitmq"
 salt -I 'rabbitmq:server' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
 
@@ -34,9 +35,8 @@ salt -I 'haproxy:proxy' state.sls haproxy
 salt -I 'haproxy:proxy' service.status haproxy
 salt -I 'haproxy:proxy' service.restart rsyslog
 
-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
+salt -I 'keystone:server' service.restart apache2
 
 wait_for 30.0 "salt -I 'keystone:client' state.sls keystone.client"
 salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"