[PATCH master 1/8] Handle node addition and removal directly

['Klaus Aehlig' via ganeti-devel]

...without going through the context.

Signed-off-by: Klaus Aehlig <aeh...@google.com>
---
 lib/cmdlib/node.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cmdlib/node.py b/lib/cmdlib/node.py
index c25366e..944db40 100644
--- a/lib/cmdlib/node.py
+++ b/lib/cmdlib/node.py
@@ -467,7 +467,7 @@ class LUNodeAdd(LogicalUnit):
         result.Warn("Node failed to demote itself from master candidate 
status",
                     self.LogWarning)
     else:
-      self.context.AddNode(self.cfg, self.new_node, self.proc.GetECId())
+      self.cfg.AddNode(self.new_node, self.proc.GetECId())
       RedistributeAncillaryFiles(self)
 
     # We create a new certificate even if the node is readded
@@ -1595,7 +1595,7 @@ class LUNodeRemove(LogicalUnit):
 
     # Promote nodes to master candidate as needed
     AdjustCandidatePool(self, [self.node.uuid])
-    self.context.RemoveNode(self.cfg, self.node)
+    self.cfg.RemoveNode(self.node.uuid)
 
     # Run post hooks on the node before it's removed
     RunPostHook(self, self.node.name)
-- 
2.2.0.rc0.207.ga3a616c