summaryrefslogtreecommitdiffstats
path: root/mcp/salt-formulas/salt-formula-apache
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-06-03 16:42:01 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-06-05 14:32:26 +0200
commita19dd7f046239f0dc89e30c43d54b6b2c228128a (patch)
tree738e578a9fd58b7291b6620d8cf0f69eb1759cfe /mcp/salt-formulas/salt-formula-apache
parenta7e9257bbfd20739069272e89bc50f5ba6dba831 (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/salt-formulas/salt-formula-apache')
m---------mcp/salt-formulas/salt-formula-apache0
1 files changed, 0 insertions, 0 deletions
diff --git a/mcp/salt-formulas/salt-formula-apache b/mcp/salt-formulas/salt-formula-apache
new file mode 160000
+Subproject 41d31d33354eeff85cd65b78fae0d5af274172b