diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-12-31 12:24:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-12-31 12:24:53 +0000 |
| commit | 804cb68bc61126d2e27e8ca9d9abfe2cd0af0cfb (patch) | |
| tree | a6fcaa960831a29d9465c53cef232b43c8fd432e /mcp/config/states/openstack_noha | |
| parent | 15d12dc0eb1bccf37a6b96c5c2188d94f199c62b (diff) | |
| parent | 991bd80d1ac3245edba257ae8aeec74278ca74a3 (diff) | |
Merge "noha: Re-enable Horizon dashboard, fix CSS" into stable/iruya
Diffstat (limited to 'mcp/config/states/openstack_noha')
| -rwxr-xr-x | mcp/config/states/openstack_noha | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha index cb6059d9e..5022e6d1a 100755 --- a/mcp/config/states/openstack_noha +++ b/mcp/config/states/openstack_noha @@ -59,4 +59,11 @@ 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 apache,horizon +salt -I 'horizon:server' state.sls apache,horizon,nginx + +# Workaround Horizon missing CSS/JS, see 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 +fi |