From 97f5a96163ec857bed230a01414daf60f11cd2dd Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 23 Apr 2018 13:59:32 +0000
Subject: [PATCH] Enable proxy header parsing

Ensure that oslo.middleware parses any proxy information
forwarded from haproxy/apache with regards to protocol;
this ensures that https connections are correctly detected.

Includes charm helper sync to bring in oslo middleware
template.

Change-Id: I1232d089ab91572ec31c1b2172881165097af5fb
Closes-Bug: 1758675
---
 templates/mitaka/nova.conf | 2 ++
 templates/ocata/nova.conf  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf
index 1a57be5e..dace7024 100644
--- a/templates/mitaka/nova.conf
+++ b/templates/mitaka/nova.conf
@@ -172,3 +172,5 @@ enabled = true
 backend = oslo_cache.memcache_pool
 memcache_servers = {{ memcached_servers }}
 {% endif %}
+
+{% include "section-oslo-middleware" %}
diff --git a/templates/ocata/nova.conf b/templates/ocata/nova.conf
index 92019dc7..4e9e12b3 100644
--- a/templates/ocata/nova.conf
+++ b/templates/ocata/nova.conf
@@ -191,3 +191,5 @@ api_paste_config=/etc/nova/api-paste.ini
 {% if pci_alias %}
 alias = {{ pci_alias }}
 {% endif %}
+
+{% include "section-oslo-middleware" %}