From 63b712d1d2052e9dd762a20184913d6394f45ea9 Mon Sep 17 00:00:00 2001
From: ting wu <ting.wu@enea.com>
Date: Wed, 23 May 2018 11:07:44 +0200
Subject: [PATCH] [Horizon] Drop the obsolete Horizon workaround

Since we switch the Horizon package from
Ubuntu/UCA repo to MCP repos,  we can drop the
obsolete Horizon workaround.

JIRA: FUEL-374

Change-Id: I0b77a4f2158a972a5eb400919f2929c7bd8360cf
Signed-off-by: ting wu <ting.wu@enea.com>
---
 mcp/config/states/openstack_ha   | 12 ------------
 mcp/config/states/openstack_noha | 10 ----------
 2 files changed, 22 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 \
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index a266989a7..70db238be 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -54,13 +54,3 @@ 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
-- 
2.16.6