X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fopenstack_ha;h=a32111f613be482da08eb8cec693a5a474861f8b;hb=6a3bbf95c70207a146c5b2c82d8518cf02e5c269;hp=73c44bb66c643768ba928c5337a7adf5af14bad3;hpb=63b712d1d2052e9dd762a20184913d6394f45ea9;p=fuel.git

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 73c44bb66..a32111f61 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -15,7 +15,7 @@ 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"
 
-salt -C 'I@rabbitmq:server and *01*' state.sls rabbitmq
+wait_for 5.0 "salt -C 'I@rabbitmq:server and *01*' state.sls rabbitmq"
 salt -I 'rabbitmq:server' state.sls rabbitmq
 salt -I 'rabbitmq:server' cmd.run "rabbitmqctl cluster_status"
 
@@ -50,9 +50,15 @@ wait_for 3.0 "salt -I 'cinder:volume' state.sls cinder"
 
 salt -I 'neutron:server' state.sls neutron -b 1
 salt -I 'neutron:gateway' state.sls neutron.gateway
+if salt 'cmp*' match.pillar 'neutron:compute' --out yaml --static  | grep -q -e "true" ; then
+  salt -I 'neutron:compute' state.sls neutron.compute
+fi
 
 salt -I 'nova:compute' state.sls nova
 
+salt -I 'barbican:server' state.sls barbican -b 1
+salt -I 'barbican:client' state.sls barbican
+
 salt -I 'redis:cluster:role:master' state.sls redis
 salt -I 'redis:server' state.sls redis
 salt -I 'gnocchi:server' state.sls gnocchi -b 1