Merge "Fix secure_proxy_ssl_header option in nova"

This commit is contained in:
Jenkins 2017-05-23 11:16:41 +00:00 committed by Gerrit Code Review
commit ae0addb387

View File

@ -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