From b19b88653d74423e2ef6f31c7149cdeb8f0f44c6 Mon Sep 17 00:00:00 2001
From: Igor Gajsin <igajsin@mirantis.com>
Date: Tue, 20 Sep 2016 15:35:08 +0300
Subject: [PATCH] Fix the bug that prevent assign 2 Cluster to one controller

In some cases Ruby uses pointer instead of copying something for
optimization. But it allows to side effects. It was cause of that bug.
After cloning one variable by var.dup the problem was fixed.

Change-Id: Ide58c184f4cb9b655e11a13afb8c05bfc5149ab9
Closes-bug: #1625092
---
 .../parser/functions/get_agents_data.rb       | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/deployment_scripts/puppet/modules/vmware_dvs/lib/puppet/parser/functions/get_agents_data.rb b/deployment_scripts/puppet/modules/vmware_dvs/lib/puppet/parser/functions/get_agents_data.rb
index 59a1d3e..376877b 100644
--- a/deployment_scripts/puppet/modules/vmware_dvs/lib/puppet/parser/functions/get_agents_data.rb
+++ b/deployment_scripts/puppet/modules/vmware_dvs/lib/puppet/parser/functions/get_agents_data.rb
@@ -13,9 +13,11 @@
     controllersp = args[4].any? {|role| role.include?("controller")}
     primaryp = args[4].any? {|role| role.include?("primary")}
     agents = []
+
     vcenter.each {|vc|
       if (vc["target_node"] == "controllers" and controllersp) or current_node == vc["target_node"]
         agent = {}
+        ns = netmaps.dup
         agent["host"] = vc["availability_zone_name"] + "-" + vc["service_name"]
         agent["vsphere_hostname"] = vc["vc_host"]
         agent["vsphere_login"] = vc["vc_user"]
@@ -23,18 +25,13 @@
         agent["vsphere_insecure"] = vc["vc_insecure"]
         agent["vsphere_ca_file"] = vc["vc_ca_file"]
         cluster = vc["vc_cluster"]
-        netmaps = netmaps.keep_if {|s| s =~ /^#{cluster}/}.first.split(":")
-        if netmaps.length == 4
-          vds = netmaps[1]
-          uplinks = netmaps[2] + ":" + netmaps[3]
-        elsif netmaps.length == 3
-          vds = netmaps[1]
-          uplinks = netmaps[2]
-        elsif netmaps.length == 2
-          vds = netmaps[1]
-          uplinks = false
-        else
-          raise 'Wrong vmware_dvs_net_maps'
+        ns = ns.keep_if {|s| s =~ /^#{cluster}/}.first.split(":")
+        vds = ns[1]
+        uplinks = false
+        if ns.length == 4
+          uplinks = ns[2] + ":" + ns[3]
+        elsif ns.length == 3
+          uplinks = ns[2]
         end
         agent["network_maps"] = physnet + ":" + vds
         agent["uplink_maps"] =  physnet + ":" + uplinks if uplinks