Merge "[ha] Fix ovn-ha scenario"

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

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 99374c5..0f6858f 100755 (executable)
--- 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,11 +50,16 @@ 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
+if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \
+  --out yaml --static | grep -q -e 'true' ; then
   salt -I 'neutron:compute' state.sls neutron.compute
 fi
 
 salt -I 'nova:compute' state.sls nova
+if salt -I 'nova:compute' match.grain 'cpuarch:aarch64' \
+  --out yaml --static | grep -q -e 'true' ; then
+  salt -C 'G@cpuarch:aarch64 and I@nova:compute' state.sls armband
+fi
 
 salt -I 'barbican:server' state.sls barbican -b 1
 salt -I 'barbican:client' state.sls barbican
@@ -67,7 +72,7 @@ salt -I 'aodh:server' state.sls aodh -b 1
 salt -I 'ceilometer:server' state.sls ceilometer
 salt -I 'ceilometer:agent' state.sls ceilometer
 
-salt -I 'horizon:server' state.sls horizon
+salt -I 'horizon:server' state.sls apache,horizon
 salt -I 'nginx:server' state.sls nginx
 
 cluster_public_host=$(salt -C 'I@nginx:server and *01*' --out=yaml \