From a19dd7f046239f0dc89e30c43d54b6b2c228128a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 3 Jun 2019 16:42:01 +0200 Subject: [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 --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 18b5ca532..b47167d9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,3 +62,7 @@ path = mcp/salt-formulas/salt-formula-kubernetes url = https://gerrit.mcp.mirantis.com/salt-formulas/kubernetes branch = master +[submodule "salt-formula-apache"] + path = mcp/salt-formulas/salt-formula-apache + url = https://gerrit.mcp.mirantis.com/salt-formulas/apache + branch = master -- cgit 1.2.3-korg