C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modify the populate no_proxy task to use a combine rather than relying on the hash_behaviour setting to be set to merge rather than replace (#6112)

Browse source
This commit is contained in:
Cody Seavey 2020-05-28 08:42:03 -05:00 committed by GitHub
parent f959cc296f
commit b6e21a18cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roles/kubespray-defaults/tasks/no_proxy.yml
View file

@ -26,6 +26,7 @@
- name: Populates no_proxy to all hosts - name: Populates no_proxy to all hosts
set_fact: set_fact:
no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}" no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}"
proxy_env: proxy_env: "{{ proxy_env | combine({
no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}" 'no_proxy': hostvars.localhost.no_proxy_prepare,
NO_PROXY: "{{ hostvars.localhost.no_proxy_prepare }}" 'NO_PROXY': hostvars.localhost.no_proxy_prepare
}) }}"