Unify the “--backend-parameters” option

[ganeti-local] / lib / confd / server.py

diff --git a/lib/confd/server.py b/lib/confd/server.py
index 601b957..0df0061 100644 (file)
--- a/lib/confd/server.py
+++ b/lib/confd/server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#
 #
 
 # Copyright (C) 2009, Google Inc.
@@ -47,11 +47,14 @@ class ConfdProcessor(object):
 
   """
   DISPATCH_TABLE = {
-      constants.CONFD_REQ_PING: querylib.PingQuery,
-      constants.CONFD_REQ_NODE_ROLE_BYNAME: querylib.NodeRoleQuery,
-      constants.CONFD_REQ_NODE_PIP_BY_INSTANCE_IP:
-        querylib.InstanceIpToNodePrimaryIpQuery,
-  }
+    constants.CONFD_REQ_PING: querylib.PingQuery,
+    constants.CONFD_REQ_NODE_ROLE_BYNAME: querylib.NodeRoleQuery,
+    constants.CONFD_REQ_NODE_PIP_BY_INSTANCE_IP:
+      querylib.InstanceIpToNodePrimaryIpQuery,
+    constants.CONFD_REQ_CLUSTER_MASTER: querylib.ClusterMasterQuery,
+    constants.CONFD_REQ_NODE_PIP_LIST: querylib.NodesPipsQuery,
+    constants.CONFD_REQ_MC_PIP_LIST: querylib.MasterCandidatesPipsQuery,
+    }
 
   def __init__(self):
     """Constructor for ConfdProcessor
@@ -173,4 +176,3 @@ class ConfdProcessor(object):
 
     """
     return serializer.DumpSigned(reply.ToDict(), self.hmac_key, rsalt)
-