Merge "[ha] Fix ovn-ha scenario"

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

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 9fc30bb..44360e5 100755 (executable)
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -42,22 +42,22 @@ salt -I 'cinder:controller' state.sls cinder
 wait_for 3 "salt -I 'cinder:volume' state.sls cinder"
 
 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
 
-wait_for 3 "salt -I 'mongodb:server' state.sls mongodb"
+salt -I 'barbican:server' state.sls barbican
+salt -I 'barbican:client' state.sls barbican
+
+salt -I 'redis:server' state.sls redis
+salt -I 'gnocchi:server' state.sls gnocchi
+salt -I 'panko:server' state.sls panko
 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
-
-# workaround for the pike horizon is missing css, FUEL-324
-salt -I 'horizon:server' file.symlink \
-  /var/lib/openstack-dashboard/static \
-  /usr/share/openstack-dashboard/static
-salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py collectstatic --noinput"
-salt -I 'horizon:server' cmd.run "/usr/share/openstack-dashboard/manage.py compress --force"
-salt -I 'horizon:server' file.append /etc/openstack-dashboard/local_settings.py \
-  "AVAILABLE_THEMES = [ ('default', 'Default', 'themes/default'),]"
-salt -I 'horizon:server' service.reload apache2
+salt -I 'horizon:server' state.sls apache,horizon