diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-06-03 16:42:01 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-06-05 14:32:26 +0200 |
| commit | a19dd7f046239f0dc89e30c43d54b6b2c228128a (patch) | |
| tree | 738e578a9fd58b7291b6620d8cf0f69eb1759cfe /mcp/reclass | |
| parent | a7e9257bbfd20739069272e89bc50f5ba6dba831 (diff) | |
[ha] Re-enable nginx proxy for Horizon
Starting with MCP 2019.2, Horizon was moved under haproxy in
Active/Active mode by default via upstream changes:
- Adding haproxy class for horizon [1];
- Cleanup nginx horizon sites by default [2];
This change re-enables the old behavior where Horizon is served by
nginx instead of haproxy.
While at it, fix missing support in salt-formula-apache for wsgi
`locations`, so Horizon dashboard can access '/static' resources
(e.g. CSS/images).
JIRA: FUEL-408
[1] https://github.com/Mirantis/reclass-system-salt-model/commit/81c4c21a
[2] https://github.com/Mirantis/reclass-system-salt-model/commit/a3b38f46
Change-Id: I9b35d5d0ce4e0b53dae808c2620a31ca80290b55
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index a327919c5..d65e67123 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -149,6 +149,7 @@ parameters: horizon_identity_host: ${_param:openstack_control_address} horizon_identity_encryption: none horizon_identity_version: 3 + nginx_server_site_nginx_proxy_openstack_web_enabled: True aodh_service_host: ${_param:openstack_telemetry_address} gnocchi_version: 4.3 gnocchi_service_host: ${_param:openstack_telemetry_address} |