Allow modifying of default nic parameters

[ganeti-local] / scripts / gnt-cluster

diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index fcf0fc9..f7f0bc3 100755 (executable)
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -34,6 +34,7 @@ from ganeti import errors
 from ganeti import utils
 from ganeti import bootstrap
 from ganeti import ssh
 from ganeti import utils
 from ganeti import bootstrap
 from ganeti import ssh

+from ganeti import objects

 
 
 @UsesRPC
 
 
 @UsesRPC

@@ -60,52 +61,33 @@ def InitCluster(opts, args):
   if hvlist is not None:
     hvlist = hvlist.split(",")
   else:
   if hvlist is not None:
     hvlist = hvlist.split(",")
   else:

-    hvlist = [constants.DEFAULT_ENABLED_HYPERVISOR]
+    hvlist = [opts.default_hypervisor]

 
   # avoid an impossible situation
 
   # avoid an impossible situation

-  if opts.default_hypervisor in hvlist:
-    default_hypervisor = opts.default_hypervisor
-  else:
-    default_hypervisor = hvlist[0]
-
-  hvparams = opts.hvparams
-  if hvparams:
-    # a list of (name, dict) we can pass directly to dict()
-    hvparams = dict(opts.hvparams)
-  else:
-    # otherwise init as empty dict
-    hvparams = {}
+  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 = dict(opts.hvparams)

   beparams = opts.beparams
   beparams = opts.beparams

-  # check for invalid parameters
-  for parameter in beparams:
-    if parameter not in constants.BES_PARAMETERS:
-      ToStderr("Invalid backend parameter: %s", parameter)
-      return 1
+  nicparams = opts.nicparams

 
   # prepare beparams dict
 
   # prepare beparams dict

-  for parameter in constants.BES_PARAMETERS:
-    if parameter not in beparams:
-      beparams[parameter] = constants.BEC_DEFAULTS[parameter]
-
-  # type wrangling
-  try:
-    beparams[constants.BE_VCPUS] = int(beparams[constants.BE_VCPUS])
-  except ValueError:
-    ToStderr("%s must be an integer", constants.BE_VCPUS)
-    return 1
+  beparams = objects.FillDict(constants.BEC_DEFAULTS, beparams)
+  utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)

 
 

-  if not isinstance(beparams[constants.BE_MEMORY], int):
-    beparams[constants.BE_MEMORY] = utils.ParseUnit(
-        beparams[constants.BE_MEMORY])
+  # prepare nicparams dict
+  nicparams = objects.FillDict(constants.NICC_DEFAULTS, nicparams)
+  utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)

 
   # prepare hvparams dict
   for hv in constants.HYPER_TYPES:
     if hv not in hvparams:
       hvparams[hv] = {}
 
   # prepare hvparams dict
   for hv in constants.HYPER_TYPES:
     if hv not in hvparams:
       hvparams[hv] = {}

-    for parameter in constants.HVC_DEFAULTS[hv]:
-      if parameter not in hvparams[hv]:
-        hvparams[hv][parameter] = constants.HVC_DEFAULTS[hv][parameter]
+    hvparams[hv] = objects.FillDict(constants.HVC_DEFAULTS[hv], hvparams[hv])
+    utils.ForceDictType(hvparams[hv], constants.HVS_PARAMETER_TYPES)

 
   for hv in hvlist:
     if hv not in constants.HYPER_TYPES:
 
   for hv in hvlist:
     if hv not in constants.HYPER_TYPES:

@@ -120,9 +102,13 @@ def InitCluster(opts, args):
                         master_netdev=opts.master_netdev,
                         file_storage_dir=opts.file_storage_dir,
                         enabled_hypervisors=hvlist,
                         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,
                         hvparams=hvparams,

-                        beparams=beparams)
+                        beparams=beparams,
+                        nicparams=nicparams,
+                        candidate_pool_size=opts.candidate_pool_size,
+                        modify_etc_hosts=opts.modify_etc_hosts,
+                        )

   return 0
 
 
   return 0
 
 

@@ -174,6 +160,21 @@ def RenameCluster(opts, args):
   return 0
 
 
   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.OpRedistributeConfig()
+  SubmitOrSend(op, opts)
+  return 0
+
+

 def ShowClusterVersion(opts, args):
   """Write version of ganeti software to the standard output.
 
 def ShowClusterVersion(opts, args):
   """Write version of ganeti software to the standard output.
 

@@ -184,8 +185,8 @@ def ShowClusterVersion(opts, args):
   @return: the desired exit code
 
   """
   @return: the desired exit code
 
   """

-  op = opcodes.OpQueryClusterInfo()
-  result = SubmitOpCode(op)
+  cl = GetClient()
+  result = cl.QueryClusterInfo()

   ToStdout("Software version: %s", result["software_version"])
   ToStdout("Internode protocol: %s", result["protocol_version"])
   ToStdout("Configuration format: %s", result["config_version"])
   ToStdout("Software version: %s", result["software_version"])
   ToStdout("Internode protocol: %s", result["protocol_version"])
   ToStdout("Configuration format: %s", result["config_version"])

@@ -204,7 +205,8 @@ def ShowClusterMaster(opts, args):
   @return: the desired exit code
 
   """
   @return: the desired exit code
 
   """

-  ToStdout("%s", GetClient().QueryConfigValues(["master_node"])[0])
+  master = bootstrap.GetMaster()
+  ToStdout(master)

   return 0
 
 
   return 0
 
 

@@ -218,8 +220,8 @@ def ShowClusterConfig(opts, args):
   @return: the desired exit code
 
   """
   @return: the desired exit code
 
   """

-  op = opcodes.OpQueryClusterInfo()
-  result = SubmitOpCode(op)
+  cl = GetClient()
+  result = cl.QueryClusterInfo()

 
   ToStdout("Cluster name: %s", result["name"])
 
 
   ToStdout("Cluster name: %s", result["name"])
 

@@ -238,6 +240,13 @@ def ShowClusterConfig(opts, args):
       ToStdout("      %s: %s", item, val)
 
   ToStdout("Cluster parameters:")
       ToStdout("      %s: %s", item, val)
 
   ToStdout("Cluster parameters:")

+  ToStdout("  - candidate pool size: %s", result["candidate_pool_size"])
+  ToStdout("  - master netdev: %s", result["master_netdev"])
+  ToStdout("  - default bridge: %s", result["default_bridge"])
+  ToStdout("  - lvm volume group: %s", result["volume_group_name"])
+  ToStdout("  - file storage path: %s", result["file_storage_dir"])
+
+  ToStdout("Default instance parameters:")

   for gr_name, gr_dict in result["beparams"].items():
     ToStdout("  - %s:", gr_name)
     for item, val in gr_dict.iteritems():
   for gr_name, gr_dict in result["beparams"].items():
     ToStdout("  - %s:", gr_name)
     for item, val in gr_dict.iteritems():

@@ -267,8 +276,8 @@ def ClusterCopyFile(opts, args):
 
   cluster_name = cl.QueryConfigValues(["cluster_name"])[0]
 
 
   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:
 
   srun = ssh.SshRunner(cluster_name=cluster_name)
   for node in results:

@@ -291,8 +300,8 @@ def RunClusterCommand(opts, args):
   cl = GetClient()
 
   command = " ".join(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"])
 
   cluster_name, master_node = cl.QueryConfigValues(["cluster_name",
                                                     "master_node"])

@@ -360,7 +369,7 @@ def VerifyDisks(opts, args):
   if nlvm:
     for node, text in nlvm.iteritems():
       ToStdout("Error on node %s: LVM error: %s",
   if nlvm:
     for node, text in nlvm.iteritems():
       ToStdout("Error on node %s: LVM error: %s",

-               node, text[-400:].encode('string_escape'))
+               node, utils.SafeEncode(text[-400:]))

       retcode |= 1
       ToStdout("You need to fix these nodes first before fixing instances")
 
       retcode |= 1
       ToStdout("You need to fix these nodes first before fixing instances")
 

@@ -448,7 +457,8 @@ def SetClusterParams(opts, args):
   """
   if not (not opts.lvm_storage or opts.vg_name or
           opts.enabled_hypervisors or opts.hvparams or
   """
   if not (not opts.lvm_storage or opts.vg_name or
           opts.enabled_hypervisors or opts.hvparams or

-          opts.beparams):
+          opts.beparams or opts.nicparams or
+          opts.candidate_pool_size is not None):

     ToStderr("Please give at least one of the parameters.")
     return 1
 
     ToStderr("Please give at least one of the parameters.")
     return 1
 

@@ -456,22 +466,30 @@ def SetClusterParams(opts, args):
   if not opts.lvm_storage and opts.vg_name:
     ToStdout("Options --no-lvm-storage and --vg-name conflict.")
     return 1
   if not opts.lvm_storage and opts.vg_name:
     ToStdout("Options --no-lvm-storage and --vg-name conflict.")
     return 1

+  elif not opts.lvm_storage:
+    vg_name = ''

 
   hvlist = opts.enabled_hypervisors
   if hvlist is not None:
     hvlist = hvlist.split(",")
 
 
   hvlist = opts.enabled_hypervisors
   if hvlist is not None:
     hvlist = hvlist.split(",")
 

-  hvparams = opts.hvparams
-  if hvparams:
-    # a list of (name, dict) we can pass directly to dict()
-    hvparams = dict(opts.hvparams)
+  # a list of (name, dict) we can pass directly to dict() (or [])
+  hvparams = dict(opts.hvparams)
+  for hv, hv_params in hvparams.iteritems():
+    utils.ForceDictType(hv_params, constants.HVS_PARAMETER_TYPES)

 
   beparams = opts.beparams
 
   beparams = opts.beparams

+  utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)

 
 

-  op = opcodes.OpSetClusterParams(vg_name=opts.vg_name,
+  nicparams = opts.nicparams
+  utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
+
+  op = opcodes.OpSetClusterParams(vg_name=vg_name,

                                   enabled_hypervisors=hvlist,
                                   hvparams=hvparams,
                                   enabled_hypervisors=hvlist,
                                   hvparams=hvparams,

-                                  beparams=beparams)
+                                  beparams=beparams,
+                                  nicparams=nicparams,
+                                  candidate_pool_size=opts.candidate_pool_size)

   SubmitOpCode(op)
   return 0
 
   SubmitOpCode(op)
   return 0
 

@@ -498,6 +516,9 @@ def QueueOps(opts, args):
     else:
       val = "unset"
     ToStdout("The drain flag is %s" % val)
     else:
       val = "unset"
     ToStdout("The drain flag is %s" % val)

+  else:
+    raise errors.OpPrereqError("Command '%s' is not valid." % command)
+

   return 0
 
 # this is an option common to more than one command, so we declare
   return 0
 
 # this is an option common to more than one command, so we declare

@@ -519,7 +540,7 @@ commands = {
                         help="Specify the mac prefix for the instance IP"
                         " addresses, in the format XX:XX:XX",
                         metavar="PREFIX",
                         help="Specify the mac prefix for the instance IP"
                         " addresses, in the format XX:XX:XX",
                         metavar="PREFIX",

-                        default="aa:00:00",),
+                        default=constants.DEFAULT_MAC_PREFIX,),

             make_option("-g", "--vg-name", dest="vg_name",
                         help="Specify the volume group name "
                         " (cluster-wide) for disk allocation [xenvg]",
             make_option("-g", "--vg-name", dest="vg_name",
                         help="Specify the volume group name "
                         " (cluster-wide) for disk allocation [xenvg]",

@@ -547,6 +568,10 @@ commands = {
                         help="No support for lvm based instances"
                              " (cluster-wide)",
                         action="store_false", default=True,),
                         help="No support for lvm based instances"
                              " (cluster-wide)",
                         action="store_false", default=True,),

+            make_option("--no-etc-hosts", dest="modify_etc_hosts",
+                        help="Don't modify /etc/hosts"
+                             " (cluster-wide)",
+                        action="store_false", default=True,),

             make_option("--enabled-hypervisors", dest="enabled_hypervisors",
                         help="Comma-separated list of hypervisors",
                         type="string", default=None),
             make_option("--enabled-hypervisors", dest="enabled_hypervisors",
                         help="Comma-separated list of hypervisors",
                         type="string", default=None),

@@ -565,6 +590,13 @@ commands = {
             keyval_option("-B", "--backend-parameters", dest="beparams",
                           type="keyval", default={},
                           help="Backend parameters"),
             keyval_option("-B", "--backend-parameters", dest="beparams",
                           type="keyval", default={},
                           help="Backend parameters"),

+            keyval_option("-N", "--nic-parameters", dest="nicparams",
+                          type="keyval", default={},
+                          help="NIC 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"),
             ],
            "[opts...] <cluster_name>",
            "Initialises a new cluster configuration"),

@@ -578,6 +610,10 @@ commands = {
   'rename': (RenameCluster, ARGS_ONE, [DEBUG_OPT, FORCE_OPT],
                "<new_name>",
                "Renames the cluster"),
   '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",
   'verify': (VerifyCluster, ARGS_NONE, [DEBUG_OPT,
              make_option("--no-nplus1-mem", dest="skip_nplusone_mem",
                          help="Skip N+1 memory redundancy tests",

@@ -636,6 +672,12 @@ commands = {
               keyval_option("-B", "--backend-parameters", dest="beparams",
                             type="keyval", default={},
                             help="Backend parameters"),
               keyval_option("-B", "--backend-parameters", dest="beparams",
                             type="keyval", default={},
                             help="Backend parameters"),

+              keyval_option("-N", "--nic-parameters", dest="nicparams",
+                            type="keyval", default={},
+                            help="NIC 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"),
               ],
              "[opts...]",
              "Alters the parameters of the cluster"),