Skip to content
Snippets Groups Projects
Unverified Commit 7ddd4cd3 authored by Andreas Krüger's avatar Andreas Krüger Committed by GitHub
Browse files

Merge pull request #2561 from rsmitty/no_proxy

only set no_proxy if other proxy vars are defined
parents c1eb9755 13c57147
No related branches found
No related tags found
No related merge requests found
......@@ -240,6 +240,7 @@ weave_peers: uninitialized
## Set no_proxy to all assigned cluster IPs and hostnames
no_proxy: >-
{%- if http_proxy is defined or https_proxy is defined %}
{%- if loadbalancer_apiserver is defined -%}
{{ apiserver_loadbalancer_domain_name| default('') }},
{{ loadbalancer_apiserver.address | default('') }},
......@@ -253,11 +254,12 @@ no_proxy: >-
{{ item }},{{ item }}.{{ dns_domain }},
{%- endfor -%}
127.0.0.1,localhost
{%- endif %}
proxy_env:
http_proxy: "{{ http_proxy| default ('') }}"
https_proxy: "{{ https_proxy| default ('') }}"
no_proxy: "{{ no_proxy }}"
no_proxy: "{{ no_proxy| default ('') }}"
# Vars for pointing to kubernetes api endpoints
is_kube_master: "{{ inventory_hostname in groups['kube-master'] }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment