Modify the populate no_proxy task to use a combine rather than relyin…

…g on the hash_behaviour setting to be set to merge rather than replace (#6112)
kubernetes-sigs · May 28, 2020 · b6e21a1 · b6e21a1
1 parent f959cc2
commit b6e21a1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/roles/kubespray-defaults/tasks/no_proxy.yml b/roles/kubespray-defaults/tasks/no_proxy.yml
@@ -26,6 +26,7 @@
 - name: Populates no_proxy to all hosts
   set_fact:
     no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}"
-    proxy_env:
-      no_proxy: "{{ hostvars.localhost.no_proxy_prepare }}"
-      NO_PROXY: "{{ hostvars.localhost.no_proxy_prepare }}"
+    proxy_env: "{{ proxy_env | combine({
+      'no_proxy': hostvars.localhost.no_proxy_prepare,
+      'NO_PROXY': hostvars.localhost.no_proxy_prepare
+    }) }}"