X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/469ee40508aea79bf933e44f0b03549c3d46a6e7..4040a7847ecaa9a163a2132c52831fbd38dc92de:/scripts/gnt-cluster

diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index f2d4bd4..09c1eb2 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -36,6 +36,7 @@ from ganeti import bootstrap
 from ganeti import ssh
 
 
+@UsesRPC
 def InitCluster(opts, args):
   """Initialize the cluster.
 
@@ -59,13 +60,14 @@ def InitCluster(opts, args):
   if hvlist is not None:
     hvlist = hvlist.split(",")
   else:
-    hvlist = [constants.DEFAULT_ENABLED_HYPERVISOR]
+    hvlist = [opts.default_hypervisor]
 
   # avoid an impossible situation
-  if opts.default_hypervisor in hvlist:
-    default_hypervisor = opts.default_hypervisor
-  else:
-    default_hypervisor = hvlist[0]
+  if opts.default_hypervisor not in hvlist:
+    ToStderr("The default hypervisor requested (%s) is not"
+             " within the enabled hypervisor list (%s)" %
+             (opts.default_hypervisor, hvlist))
+    return 1
 
   hvparams = opts.hvparams
   if hvparams:
@@ -94,7 +96,9 @@ def InitCluster(opts, args):
     ToStderr("%s must be an integer", constants.BE_VCPUS)
     return 1
 
-  beparams[constants.BE_MEMORY] = utils.ParseUnit(beparams[constants.BE_MEMORY])
+  if not isinstance(beparams[constants.BE_MEMORY], int):
+    beparams[constants.BE_MEMORY] = utils.ParseUnit(
+        beparams[constants.BE_MEMORY])
 
   # prepare hvparams dict
   for hv in constants.HYPER_TYPES:
@@ -117,12 +121,15 @@ def InitCluster(opts, args):
                         master_netdev=opts.master_netdev,
                         file_storage_dir=opts.file_storage_dir,
                         enabled_hypervisors=hvlist,
-                        default_hypervisor=default_hypervisor,
+                        default_hypervisor=opts.default_hypervisor,
                         hvparams=hvparams,
-                        beparams=beparams)
+                        beparams=beparams,
+                        candidate_pool_size=opts.candidate_pool_size,
+                        )
   return 0
 
 
+@UsesRPC
 def DestroyCluster(opts, args):
   """Destroy the cluster.
 
@@ -170,6 +177,21 @@ def RenameCluster(opts, args):
   return 0
 
 
+def RedistributeConfig(opts, args):
+  """Forces push of the cluster configuration.
+
+  @param opts: the command line options selected by the user
+  @type args: list
+  @param args: empty list
+  @rtype: int
+  @return: the desired exit code
+
+  """
+  op = opcodes.OpRedistributeConf()
+  SubmitOrSend(op, opts)
+  return 0
+
+
 def ShowClusterVersion(opts, args):
   """Write version of ganeti software to the standard output.
 
@@ -234,6 +256,9 @@ def ShowClusterConfig(opts, args):
       ToStdout("      %s: %s", item, val)
 
   ToStdout("Cluster parameters:")
+  ToStdout("  - candidate pool size: %s", result["candidate_pool_size"])
+
+  ToStdout("Default instance parameters:")
   for gr_name, gr_dict in result["beparams"].items():
     ToStdout("  - %s:", gr_name)
     for item, val in gr_dict.iteritems():
@@ -263,8 +288,8 @@ def ClusterCopyFile(opts, args):
 
   cluster_name = cl.QueryConfigValues(["cluster_name"])[0]
 
-  op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes)
-  results = [row[0] for row in SubmitOpCode(op, cl=cl) if row[0] != myname]
+  results = GetOnlineNodes(nodes=opts.nodes, cl=cl)
+  results = [name for name in results if name != myname]
 
   srun = ssh.SshRunner(cluster_name=cluster_name)
   for node in results:
@@ -287,8 +312,8 @@ def RunClusterCommand(opts, args):
   cl = GetClient()
 
   command = " ".join(args)
-  op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes)
-  nodes = [row[0] for row in SubmitOpCode(op, cl=cl)]
+
+  nodes = GetOnlineNodes(nodes=opts.nodes, cl=cl)
 
   cluster_name, master_node = cl.QueryConfigValues(["cluster_name",
                                                     "master_node"])
@@ -394,6 +419,7 @@ def VerifyDisks(opts, args):
   return retcode
 
 
+@UsesRPC
 def MasterFailover(opts, args):
   """Failover the master node.
 
@@ -443,7 +469,7 @@ def SetClusterParams(opts, args):
   """
   if not (not opts.lvm_storage or opts.vg_name or
           opts.enabled_hypervisors or opts.hvparams or
-          opts.beparams):
+          opts.beparams or opts.candidate_pool_size is not None):
     ToStderr("Please give at least one of the parameters.")
     return 1
 
@@ -466,7 +492,8 @@ def SetClusterParams(opts, args):
   op = opcodes.OpSetClusterParams(vg_name=opts.vg_name,
                                   enabled_hypervisors=hvlist,
                                   hvparams=hvparams,
-                                  beparams=beparams)
+                                  beparams=beparams,
+                                  candidate_pool_size=opts.candidate_pool_size)
   SubmitOpCode(op)
   return 0
 
@@ -560,6 +587,10 @@ commands = {
             keyval_option("-B", "--backend-parameters", dest="beparams",
                           type="keyval", default={},
                           help="Backend parameters"),
+            make_option("-C", "--candidate-pool-size",
+                        default=constants.MASTER_POOL_SIZE_DEFAULT,
+                        help="Set the candidate pool size",
+                        dest="candidate_pool_size", type="int"),
             ],
            "[opts...] <cluster_name>",
            "Initialises a new cluster configuration"),
@@ -573,6 +604,10 @@ commands = {
   'rename': (RenameCluster, ARGS_ONE, [DEBUG_OPT, FORCE_OPT],
                "<new_name>",
                "Renames the cluster"),
+  'redist-conf': (RedistributeConfig, ARGS_NONE, [DEBUG_OPT, SUBMIT_OPT],
+                  "",
+                  "Forces a push of the configuration file and ssconf files"
+                  " to the nodes in the cluster"),
   'verify': (VerifyCluster, ARGS_NONE, [DEBUG_OPT,
              make_option("--no-nplus1-mem", dest="skip_nplusone_mem",
                          help="Skip N+1 memory redundancy tests",
@@ -631,6 +666,9 @@ commands = {
               keyval_option("-B", "--backend-parameters", dest="beparams",
                             type="keyval", default={},
                             help="Backend parameters"),
+              make_option("-C", "--candidate-pool-size", default=None,
+                          help="Set the candidate pool size",
+                          dest="candidate_pool_size", type="int"),
               ],
              "[opts...]",
              "Alters the parameters of the cluster"),