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/patches | |
| 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/patches')
| -rw-r--r-- | mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch b/mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch new file mode 100644 index 000000000..6304424d3 --- /dev/null +++ b/mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch @@ -0,0 +1,32 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2019 Mirantis Inc., Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Wed, 5 Jun 2019 14:23:21 +0200 +Subject: [PATCH] wsgi.conf: Allow configuration of `locations` + +wsgi configuration template should also asupport configuring locations +in order to allow Horizon resources to be accessed from '/static', +otherwise the system level reclass config for it is silently ignored. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + apache/files/wsgi.conf | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/apache/files/wsgi.conf b/apache/files/wsgi.conf +index cad01dc..d375708 100644 +--- a/apache/files/wsgi.conf ++++ b/apache/files/wsgi.conf +@@ -26,4 +26,6 @@ Listen {{ site.host.address }}:{{ site.host.port }} + Allow from all + </IfVersion> + </Directory> ++ ++ {%- include "apache/files/_locations.conf" %} + </VirtualHost> |