Skip to content
Snippets Groups Projects
Commit ae0addb3 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Fix secure_proxy_ssl_header option in nova"

parents 1246266f b67cd3f7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/nova/templates/nova.conf.j2
+ 3
− 4
View file @ ae0addb3
...@@ -6,10 +6,6 @@ log_dir = /var/log/kolla/nova ...@@ -6,10 +6,6 @@ log_dir = /var/log/kolla/nova
state_path = /var/lib/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 = {{ api_interface_address }}
osapi_compute_listen_port = {{ nova_api_port }} osapi_compute_listen_port = {{ nova_api_port }}
osapi_compute_workers = {{ openstack_service_workers }} osapi_compute_workers = {{ openstack_service_workers }}
...@@ -221,6 +217,9 @@ debug = {{ nova_logging_debug }} ...@@ -221,6 +217,9 @@ debug = {{ nova_logging_debug }}
[wsgi] [wsgi]
api_paste_config = /etc/nova/api-paste.ini api_paste_config = /etc/nova/api-paste.ini
{% if kolla_enable_tls_external | bool %}
secure_proxy_ssl_header = X-Forwarded-Proto
{% endif %}
[scheduler] [scheduler]
max_attempts = 10 max_attempts = 10
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment