(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
@return: the desired exit code
"""
- ToStdout("%s", GetClient().QueryConfigValues(["master_node"])[0])
+ master = bootstrap.GetMaster()
+ ToStdout(master)
return 0
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():
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)
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