[ha] Re-enable nginx proxy for Horizon 93/67993/2
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 3 Jun 2019 14:42:01 +0000 (16:42 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 5 Jun 2019 12:32:26 +0000 (14:32 +0200)
commita19dd7f046239f0dc89e30c43d54b6b2c228128a
tree738e578a9fd58b7291b6620d8cf0f69eb1759cfe
parenta7e9257bbfd20739069272e89bc50f5ba6dba831
[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>
.gitmodules
mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch [new file with mode: 0644]
mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
mcp/salt-formulas/salt-formula-apache [new submodule]