Browse Source
Merge pull request #2561 from rsmitty/no_proxy
only set no_proxy if other proxy vars are defined
pull/2566/head
Andreas Krüger
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
1 deletions
-
roles/kubespray-defaults/defaults/main.yaml
|
|
@ -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'] }}" |
|
|
|