Revert "[baremetal] Retire mas01 NAT"

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

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 1578dcf..9fc30bb 100755 (executable)
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -9,6 +9,9 @@
 
 CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
 
+# shellcheck disable=SC1090
+source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
+
 salt -I 'nfs:server' file.mkdir /srv/nova/instances
 salt -I 'nfs:server' state.sls nfs
 salt -I 'nfs:client' state.sls nfs
@@ -36,16 +39,25 @@ salt -I 'nova:controller' state.sls nova
 salt -I 'heat:server' state.sls heat
 
 salt -I 'cinder:controller' state.sls cinder
-salt -I 'cinder:volume' state.sls cinder
+wait_for 3 "salt -I 'cinder:volume' state.sls cinder"
 
 salt -I 'neutron:server' state.sls neutron
-salt -I 'neutron:gateway' state.sls neutron
 
 salt -I 'nova:compute' state.sls nova
 
-salt -I 'mongodb:server' state.sls mongodb || salt -I 'mongodb:server' state.sls mongodb
+wait_for 3 "salt -I 'mongodb:server' state.sls mongodb"
 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