From 587f7b33a74302e170c2bda397d2f63258dd65bd Mon Sep 17 00:00:00 2001
From: LucasBoisserie <LucasBoisserie@users.noreply.github.com>
Date: Tue, 7 Jul 2020 17:05:59 +0200
Subject: [PATCH] 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) (#6346)

Co-authored-by: Cody Seavey <seavey.cody@gmail.com>
---
 roles/kubespray-defaults/tasks/no_proxy.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/kubespray-defaults/tasks/no_proxy.yml b/roles/kubespray-defaults/tasks/no_proxy.yml
index 73fa0bbfa..82613882d 100644
--- 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
+    }) }}"