X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fopenstack_noha;h=5022e6d1a2d17bf89d976add056cbf18d6c81b74;hb=991bd80d1ac3245edba257ae8aeec74278ca74a3;hp=bcb780738823ce8305d82b33b234fde8ac0de380;hpb=97b36af156a059cf2568b046cf5d0871562348ff;p=fuel.git

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index bcb780738..5022e6d1a 100755
--- 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
@@ -41,13 +38,32 @@ salt -I 'heat:server' state.sls heat
 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:server' state.sls etcd,neutron
+salt -I 'neutron:compute' state.sls neutron
 
-salt -I 'nova:compute' state.sls nova
+salt -I 'nova:compute' state.sls nova,armband
 
-wait_for 3 "salt -I 'mongodb:server' state.sls mongodb"
+salt -I 'barbican:server' state.sls barbican
+salt -I 'barbican:client' state.sls barbican
+
+# remove config files coming from packages
+for service in gnocchi panko; do
+  salt -I "${service}:server" pkg.install ${service}-api
+  salt -I "${service}:server" file.remove "/etc/apache2/sites-enabled/${service}-api.conf"
+done
+
+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
+salt -I 'horizon:server' state.sls apache,horizon,nginx
+
+# Workaround Horizon missing CSS/JS, see FUEL-324
+if ! salt -C 'I@horizon:server and *01*' --out=yaml pkg.version openstack-dashboard | grep -qE ':.*mcp'; then
+  salt -I 'horizon:server' file.symlink \
+    /var/lib/openstack-dashboard/static \
+    /usr/share/openstack-dashboard/static
+fi