From b67cd3f7a91574f4674d5d2b94613d774b03f85f Mon Sep 17 00:00:00 2001
From: shaofeng_cheng <523675833@qq.com>
Date: Fri, 31 Mar 2017 14:41:06 +0800
Subject: [PATCH] Fix secure_proxy_ssl_header option in nova
Option "secure_proxy_ssl_header" from group "DEFAULT" has been
deprecated in the N release and has been removed in the O release.
Use wsgi.secure_proxy_ssl_header configuration instead.
see
https://docs.openstack.org/ocata/config-reference/compute/config-options.html
https://docs.openstack.org/newton/config-reference/tables/conf-changes/nova.html
https://docs.openstack.org/mitaka/config-reference/compute/config-options.html
Change-Id: Icf3eea66f4ac281641ba22e8194aa113b57f6ce8
---
ansible/roles/nova/templates/nova.conf.j2 | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/nova/templates/nova.conf.j2 b/ansible/roles/nova/templates/nova.conf.j2
index 22128d9c4a..91846f3a0c 100644
--- a/ansible/roles/nova/templates/nova.conf.j2
+++ b/ansible/roles/nova/templates/nova.conf.j2
@@ -6,10 +6,6 @@ log_dir = /var/log/kolla/nova
state_path = /var/lib/nova
-{% if kolla_enable_tls_external | bool %}
-secure_proxy_ssl_header = X-Forwarded-Proto
-{% endif %}
-
osapi_compute_listen = {{ api_interface_address }}
osapi_compute_listen_port = {{ nova_api_port }}
osapi_compute_workers = {{ openstack_service_workers }}
@@ -221,6 +217,9 @@ debug = {{ nova_logging_debug }}
[wsgi]
api_paste_config = /etc/nova/api-paste.ini
+{% if kolla_enable_tls_external | bool %}
+secure_proxy_ssl_header = X-Forwarded-Proto
+{% endif %}
[scheduler]
max_attempts = 10