diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-25 16:41:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-25 16:41:53 +0000 |
| commit | 89222bf32635fe158109c7793b9916803bddf344 (patch) | |
| tree | 7ef2a04d4fb37819a37a7fcc2e87d9c7912ab5b7 | |
| parent | 883e14e43fef1bd7814bb2954d61159400a8f934 (diff) | |
| parent | e53df8ff6a611203e06bb1bd8ca9ace65ea8801a (diff) | |
Merge "Horizon: Fix and reload missing css in Pike"
| -rwxr-xr-x | mcp/config/states/openstack_ha | 10 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_noha | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index 4948a504d..0bbf7cde5 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -65,6 +65,16 @@ salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon salt -I 'nginx:server' state.sls nginx,sphinx +# 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 + clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \ pillar.get _param:cluster_vip_address | awk '{print $2; exit}') salt -C 'I@nginx:server and *01*' cp.push \ diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index bcb780738..9fc30bbf1 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -51,3 +51,13 @@ 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 |