(opts.default_hypervisor, hvlist))
return 1
- 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 = {}
+ hvparams = dict(opts.hvparams)
beparams = opts.beparams
# check for invalid parameters
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
-
- if not isinstance(beparams[constants.BE_MEMORY], int):
- beparams[constants.BE_MEMORY] = utils.ParseUnit(
- beparams[constants.BE_MEMORY])
+ utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
# prepare hvparams dict
for hv in constants.HYPER_TYPES:
for parameter in constants.HVC_DEFAULTS[hv]:
if parameter not in hvparams[hv]:
hvparams[hv][parameter] = constants.HVC_DEFAULTS[hv][parameter]
+ utils.ForceDictType(hvparams[hv], constants.HVS_PARAMETER_TYPES)
for hv in hvlist:
if hv not in constants.HYPER_TYPES:
hvparams=hvparams,
beparams=beparams,
candidate_pool_size=opts.candidate_pool_size,
+ modify_etc_hosts=opts.modify_etc_hosts,
)
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.
@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"])
@return: the desired exit code
"""
- ToStdout("%s", GetClient().QueryConfigValues(["master_node"])[0])
+ master = bootstrap.GetMaster()
+ ToStdout(master)
return 0
@return: the desired exit code
"""
- op = opcodes.OpQueryClusterInfo()
- result = SubmitOpCode(op)
+ cl = GetClient()
+ result = cl.QueryClusterInfo()
ToStdout("Cluster name: %s", result["name"])
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():
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:
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"])
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")
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(",")
- 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
+ utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
- op = opcodes.OpSetClusterParams(vg_name=opts.vg_name,
+ op = opcodes.OpSetClusterParams(vg_name=vg_name,
enabled_hypervisors=hvlist,
hvparams=hvparams,
beparams=beparams,
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
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]",
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),
'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",
projects / ganeti-local / blobdiff