openstack/kolla-ansible
Code Issues Proposed changes

Fix the ssl issue for placement api when enabled ssl

Browse Source 
Change-Id: I43db3048f92207da5ec3a2b9ed52b4c4083c3881
Closes-Bug: #1745128
This commit is contained in:
Jeffrey Zhang 2018-01-24 18:28:06 +08:00
parent 7a8e41e78a
commit def1adb6b4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -139,7 +139,7 @@ listen nova_metadata
listen placement_api listen placement_api
bind {{ kolla_internal_vip_address }}:{{ placement_api_port }} bind {{ kolla_internal_vip_address }}:{{ placement_api_port }}
http-request del-header X-Forwarded-Proto http-request del-header X-Forwarded-Proto if { ssl_fc }
{% for host in groups['placement-api'] %} {% for host in groups['placement-api'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ placement_api_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ placement_api_port }} check inter 2000 rise 2 fall 5
{% endfor %} {% endfor %}
@ -192,8 +192,8 @@ listen nova_metadata_external
{% endfor %} {% endfor %}
listen placement_api_external listen placement_api_external
bind {{ kolla_external_vip_address }}:{{ placement_api_port }} bind {{ kolla_external_vip_address }}:{{ placement_api_port }} {{ tls_bind_info }}
http-request del-header X-Forwarded-Proto http-request del-header X-Forwarded-Proto if { ssl_fc }
http-request set-header X-Forwarded-Proto https if { ssl_fc } http-request set-header X-Forwarded-Proto https if { ssl_fc }
{% for host in groups['placement-api'] %} {% for host in groups['placement-api'] %}
server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ placement_api_port }} check inter 2000 rise 2 fall 5 server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ placement_api_port }} check inter 2000 rise 2 fall 5