summaryrefslogtreecommitdiffstats
path: root/mcp/config/states/openstack_ha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-24 16:37:56 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-24 16:37:57 +0000
commitdfe08086ac3d02a921bdd5cb3e52865396f1d774 (patch)
tree9b65d1b5eca11b9336dee2481a918296ffdd3038 /mcp/config/states/openstack_ha
parent8a5df5e7f886cfa27260d62a963fb0cb60d346ff (diff)
parent63b712d1d2052e9dd762a20184913d6394f45ea9 (diff)
Merge "[Horizon] Drop the obsolete Horizon workaround"
Diffstat (limited to 'mcp/config/states/openstack_ha')
-rwxr-xr-xmcp/config/states/openstack_ha12
1 files changed, 0 insertions, 12 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index a30f9af63..73c44bb66 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -64,18 +64,6 @@ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
salt -I 'nginx:server' state.sls nginx
-# workaround for Ubuntu Pike Horizon missing css, 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
- 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
-fi
-
cluster_public_host=$(salt -C 'I@nginx:server and *01*' --out=yaml \
pillar.get _param:cluster_public_host | awk '{print $2; exit}')
dashboard_host=$(salt -C 'I@nginx:server and *01*' --out=yaml cp.push \