Remove rabbitmq hostname option

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

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 0253023..98e2eff 100755 (executable)
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -23,17 +23,14 @@ salt -I 'mysql:server' state.sls mysql
 salt -I 'memcached:server' state.sls memcached
 salt -I 'haproxy:proxy' state.sls haproxy
 
-set +e; salt -I 'keystone:server' state.sls keystone.server; set -e
-salt -I 'keystone:server' service.restart apache2
 salt -I 'keystone:server' state.sls keystone.server
+salt -I 'keystone:server' service.restart apache2
 
 salt -I 'keystone:server' state.sls keystone.client
 salt -I 'keystone:server' cmd.run ". /root/keystonercv3; openstack service list"
 
 salt -I 'glance:server' state.sls glance
 
-# apply nova state twice to complete broken db sync
-salt -I 'nova:controller' state.sls nova
 salt -I 'nova:controller' state.sls nova
 
 salt -I 'heat:server' state.sls heat
@@ -45,6 +42,10 @@ salt -I 'neutron:server' state.sls neutron
 salt -I 'neutron:compute' state.sls neutron
 
 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
 salt -I 'barbican:client' state.sls barbican
@@ -56,4 +57,4 @@ salt -I 'aodh:server' state.sls aodh
 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