openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Merge "Role should default to no external SSL termination"

Browse Source
This commit is contained in:
Jenkins 2016-03-05 02:08:33 +00:00 committed by Gerrit Code Review
commit 347e751ddc
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -164,8 +164,10 @@ nova_console_ssl_dir: "/etc/nova/ssl"
nova_console_ssl_cert: "{{ nova_console_ssl_dir }}/nova-console.pem"
nova_console_ssl_key: "{{ nova_console_ssl_dir }}/nova-console.key"
# Set to true when terminating SSL/TLS at a load balancer
nova_external_ssl: false
# External SSL forwarding proto
nova_ssl_external: true
nova_secure_proxy_ssl_header: HTTP_X_FORWARDED_PROTO
## Nova global config

2
templates/nova.conf.j2
View File

@ -13,7 +13,7 @@ state_path = {{ nova_system_home_folder }}
rootwrap_config = /etc/nova/rootwrap.conf
service_down_time = 120
{% if nova_ssl_external | bool %}
{% if nova_external_ssl | bool %}
secure_proxy_ssl_header = {{ nova_secure_proxy_ssl_header }}
{% endif %}