remove legacy headnode code as it's been replaced by bridgeconfig
smbaker [Thu, 24 Jan 2013 01:44:22 +0000 (17:44 -0800)]
apps/gacks/gacksnodepicker.py

index 49cb1df..23eb007 100644 (file)
@@ -120,9 +120,6 @@ class GacksNodePicker():
 
         handler = self.get_handler(resource)
 
-        # get masterNode before we reset vsys_ipList in initializeHPCTags
-        masterNode = handler.getMasterNode(sliceName)
-
         # setup the vsys_* tags for HPC slices
         handler.initializeHPCTags(sliceName)
 
@@ -152,17 +149,6 @@ class GacksNodePicker():
 
         add_set_names = [x["name"] for x in addSet]
         del_set_names = [x["name"] for x in delSet]
-        new_node_names = [x for x in old_node_names if not (x in del_set_names)] + add_set_names
-
-        # ensure masterNode remains at the top of the list
-        if masterNode in new_node_names:
-            new_node_names.remove(masterNode)
-            new_node_names = [masterNode] + new_node_names
-
-        self.mylogger().info("masterNode=%s" % masterNode)
-        self.mylogger().info("new_node_names=%s" % new_node_names)
-
-        handler.updateIPList(sliceName, new_node_names)
 
         handler.delNodes(sliceName, delSet)
         handler.addNodes(sliceName, addSet)
@@ -175,11 +161,7 @@ class GacksNodePicker():
                   "delSet": delSet,
                   "addSet": addSet,
                   "delSetNames": del_set_names,
-                  "addSetNames": add_set_names,
-                  "nodeNames": new_node_names}
-
-        if (len(new_node_names)>0):
-            result["headNode"] = new_node_names[0]
+                  "addSetNames": add_set_names}
 
         return result