from ganeti import uidpool
from ganeti import compat
+PREALLOC_WIPE_DISKS_OPT = cli_option("--prealloc-wipe-disks", default=False,
+ action="store_true",
+ dest="prealloc_wipe_disks",
+ help=("Wipe disks prior to instance"
+ " creation"))
@UsesRPC
def InitCluster(opts, args):
if uid_pool is not None:
uid_pool = uidpool.ParseUidPool(uid_pool)
+ try:
+ primary_ip_version = int(opts.primary_ip_version)
+ except (ValueError, TypeError), err:
+ ToStderr("Invalid primary ip version value: %s" % str(err))
+ return 1
+
bootstrap.InitCluster(cluster_name=args[0],
secondary_ip=opts.secondary_ip,
vg_name=vg_name,
drbd_helper=drbd_helper,
uid_pool=uid_pool,
default_iallocator=opts.default_iallocator,
- primary_ip_version=constants.IP4_VERSION,
+ primary_ip_version=primary_ip_version,
+ prealloc_wipe_disks=opts.prealloc_wipe_disks,
)
op = opcodes.OpPostInitCluster()
SubmitOpCode(op, opts=opts)
op = opcodes.OpRenameCluster(name=new_name)
result = SubmitOpCode(op, opts=opts, cl=cl)
- ToStdout("Cluster renamed from '%s' to '%s'", cluster_name, result)
+ if result:
+ ToStdout("Cluster renamed from '%s' to '%s'", cluster_name, result)
return 0
uidpool.FormatUidPool(result["uid_pool"],
roman=opts.roman_integers))
ToStdout(" - default instance allocator: %s", result["default_iallocator"])
+ ToStdout(" - primary ip version: %d", result["primary_ip_version"])
+ ToStdout(" - preallocation wipe disks: %s", result["prealloc_wipe_disks"])
ToStdout("Default instance parameters:")
_PrintGroupedParams(result["beparams"], roman=opts.roman_integers)
@return: the desired exit code
"""
+ cl = GetClient()
+
op = opcodes.OpVerifyDisks()
- result = SubmitOpCode(op, opts=opts)
+ result = SubmitOpCode(op, opts=opts, cl=cl)
if not isinstance(result, (list, tuple)) or len(result) != 3:
raise errors.ProgrammerError("Unknown result type for OpVerifyDisks")
op = opcodes.OpActivateInstanceDisks(instance_name=iname)
try:
ToStdout("Activating disks for instance '%s'", iname)
- SubmitOpCode(op, opts=opts)
+ SubmitOpCode(op, opts=opts, cl=cl)
except errors.GenericError, err:
nret, msg = FormatError(err)
retcode |= nret
ToStderr("Error activating disks for instance %s: %s", iname, msg)
if missing:
+ (vg_name, ) = cl.QueryConfigValues(["volume_group_name"])
+
for iname, ival in missing.iteritems():
all_missing = compat.all(x[0] in bad_nodes for x in ival)
if all_missing:
ival.sort()
for node, vol in ival:
if node in bad_nodes:
- ToStdout("\tbroken node %s /dev/xenvg/%s", node, vol)
+ ToStdout("\tbroken node %s /dev/%s/%s", node, vg_name, vol)
else:
- ToStdout("\t%s /dev/xenvg/%s", node, vol)
+ ToStdout("\t%s /dev/%s/%s", node, vg_name, vol)
+
ToStdout("You need to run replace_disks for all the above"
- " instances, if this message persist after fixing nodes.")
+ " instances, if this message persist after fixing nodes.")
retcode |= 1
return retcode
NOLVM_STORAGE_OPT, NOMODIFY_ETCHOSTS_OPT, NOMODIFY_SSH_SETUP_OPT,
SECONDARY_IP_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
UIDPOOL_OPT, DRBD_HELPER_OPT, NODRBD_STORAGE_OPT,
- DEFAULT_IALLOCATOR_OPT],
+ DEFAULT_IALLOCATOR_OPT, PRIMARY_IP_VERSION_OPT, PREALLOC_WIPE_DISKS_OPT],
"[opts...] <cluster_name>", "Initialises a new cluster configuration"),
'destroy': (
DestroyCluster, ARGS_NONE, [YES_DOIT_OPT],
"", "Destroy cluster"),
'rename': (
RenameCluster, [ArgHost(min=1, max=1)],
- [FORCE_OPT],
+ [FORCE_OPT, DRY_RUN_OPT],
"<new_name>",
"Renames the cluster"),
'redist-conf': (
- RedistributeConfig, ARGS_NONE, [SUBMIT_OPT],
+ RedistributeConfig, ARGS_NONE, [SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
"", "Forces a push of the configuration file and ssconf files"
" to the nodes in the cluster"),
'verify': (
VerifyCluster, ARGS_NONE,
- [VERBOSE_OPT, DEBUG_SIMERR_OPT, ERROR_CODES_OPT, NONPLUS1_OPT],
+ [VERBOSE_OPT, DEBUG_SIMERR_OPT, ERROR_CODES_OPT, NONPLUS1_OPT,
+ DRY_RUN_OPT, PRIORITY_OPT],
"", "Does a check on the cluster configuration"),
'verify-disks': (
- VerifyDisks, ARGS_NONE, [],
+ VerifyDisks, ARGS_NONE, [PRIORITY_OPT],
"", "Does a check on the cluster disk status"),
'repair-disk-sizes': (
- RepairDiskSizes, ARGS_MANY_INSTANCES, [],
+ RepairDiskSizes, ARGS_MANY_INSTANCES, [DRY_RUN_OPT, PRIORITY_OPT],
"", "Updates mismatches in recorded disk sizes"),
'master-failover': (
MasterFailover, ARGS_NONE, [NOVOTING_OPT],
'list-tags': (
ListTags, ARGS_NONE, [], "", "List the tags of the cluster"),
'add-tags': (
- AddTags, [ArgUnknown()], [TAG_SRC_OPT],
+ AddTags, [ArgUnknown()], [TAG_SRC_OPT, PRIORITY_OPT],
"tag...", "Add tags to the cluster"),
'remove-tags': (
- RemoveTags, [ArgUnknown()], [TAG_SRC_OPT],
+ RemoveTags, [ArgUnknown()], [TAG_SRC_OPT, PRIORITY_OPT],
"tag...", "Remove tags from the cluster"),
'search-tags': (
- SearchTags, [ArgUnknown(min=1, max=1)],
- [], "", "Searches the tags on all objects on"
+ SearchTags, [ArgUnknown(min=1, max=1)], [PRIORITY_OPT], "",
+ "Searches the tags on all objects on"
" the cluster for a given pattern (regex)"),
'queue': (
QueueOps,
[BACKEND_OPT, CP_SIZE_OPT, ENABLED_HV_OPT, HVLIST_OPT,
NIC_PARAMS_OPT, NOLVM_STORAGE_OPT, VG_NAME_OPT, MAINTAIN_NODE_HEALTH_OPT,
UIDPOOL_OPT, ADD_UIDS_OPT, REMOVE_UIDS_OPT, DRBD_HELPER_OPT,
- NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT, RESERVED_LVS_OPT],
+ NODRBD_STORAGE_OPT, DEFAULT_IALLOCATOR_OPT, RESERVED_LVS_OPT,
+ DRY_RUN_OPT, PRIORITY_OPT],
"[opts...]",
"Alters the parameters of the cluster"),
"renew-crypto": (
projects / ganeti-local / blobdiff