diff options
| author |   ting wu <ting.wu@enea.com> | 2018-05-23 11:07:44 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-24 16:38:07 +0000 |
| commit | e6685124258ed9d1237acf9d8b383c07f1397f93 (patch) | |
| tree | 62366377b6f38ca8b398a4c7c9861302dd67822c | |
| parent | b1f2be631eb5c2622beae350b992aa034885cd7c (diff) | |
[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>
(cherry picked from commit 63b712d1d2052e9dd762a20184913d6394f45ea9)
| -rwxr-xr-x | mcp/config/states/openstack_ha | 12 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 10 |
2 files changed, 0 insertions, 22 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 77063d6c8..576a47e13 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -65,18 +65,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 4c8cbcf8a..0fffd7a55 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -52,13 +52,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 |