Merge "Make no_proxy handling more robust"

This commit is contained in:
Zuul 2020-09-30 16:39:34 +00:00 committed by Gerrit Code Review
commit e05162835d

View File

@ -57,10 +57,15 @@ container_http_proxy: ""
container_https_proxy: "" container_https_proxy: ""
container_no_proxy: "localhost,127.0.0.1" container_no_proxy: "localhost,127.0.0.1"
container_proxy_no_proxy_entries:
- "{{ container_no_proxy }}"
- "{{ api_interface_address }}"
- "{{ kolla_internal_vip_address | default('') }}"
container_proxy: container_proxy:
http_proxy: "{{ container_http_proxy }}" http_proxy: "{{ container_http_proxy }}"
https_proxy: "{{ container_https_proxy }}" https_proxy: "{{ container_https_proxy }}"
no_proxy: "{{ container_no_proxy }},{{ api_interface_address }},{{ kolla_internal_vip_address }}" no_proxy: "{{ container_proxy_no_proxy_entries | select | join(',') }}"
# By default, Kolla API services bind to the network address assigned # By default, Kolla API services bind to the network address assigned
# to the api_interface. Allow the bind address to be an override. # to the api_interface. Allow the bind address to be an override.