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_ha | |
| parent | 15d12dc0eb1bccf37a6b96c5c2188d94f199c62b (diff) | |
| parent | 991bd80d1ac3245edba257ae8aeec74278ca74a3 (diff) | |
Merge "noha: Re-enable Horizon dashboard, fix CSS" into stable/iruya
Diffstat (limited to 'mcp/config/states/openstack_ha')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index c28d0b46b..4bea06134 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -86,6 +86,13 @@ salt -I 'ceilometer:agent' state.sls ceilometer wait_for 3.0 "salt -I 'horizon:server' state.sls apache,horizon" salt -I 'nginx:server' state.sls 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 + 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 \ |