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 +++ ...sgi.conf-Allow-configuration-of-locations.patch | 32 ++++++++++++++++++++++ .../cluster/mcp-common-ha/openstack_init.yml.j2 | 1 + mcp/salt-formulas/salt-formula-apache | 1 + 4 files changed, 38 insertions(+) create mode 100644 mcp/patches/salt-formula-apache/0001-wsgi.conf-Allow-configuration-of-locations.patch create mode 160000 mcp/salt-formulas/salt-formula-apache 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 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 +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 +--- + 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 + + ++ ++ {%- include "apache/files/_locations.conf" %} + 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} diff --git a/mcp/salt-formulas/salt-formula-apache b/mcp/salt-formulas/salt-formula-apache new file mode 160000 index 000000000..41d31d333 --- /dev/null +++ b/mcp/salt-formulas/salt-formula-apache @@ -0,0 +1 @@ +Subproject commit 41d31d33354eeff85cd65b78fae0d5af274172b1 -- cgit 1.2.3-korg