diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-06-06 13:46:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-06-06 13:46:29 +0000 |
| commit | ed04ad3dcbc5aece711ea48d165b7f587d050ea1 (patch) | |
| tree | 4ecae6c35bff1650442d79a36c88cb0c44059203 /mcp | |
| parent | 57c56e54d4f78be897b03073cf882c62ad6d5822 (diff) | |
| parent | a19dd7f046239f0dc89e30c43d54b6b2c228128a (diff) | |
Merge "[ha] Re-enable nginx proxy for Horizon"
Diffstat (limited to 'mcp')
3 files changed, 33 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> 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 +Subproject 41d31d33354eeff85cd65b78fae0d5af274172b |