if mode == _SHUTDOWN_CLUSTER:
if names:
raise errors.OpPrereqError("Cluster filter mode takes no arguments")
- op = opcodes.OpQueryInstances(output_fields=["name"], names=[])
- idata = SubmitOpCode(op)
+ client = GetClient()
+ idata = client.QueryInstances([], ["name"])
inames = [row[0] for row in idata]
elif mode in (_SHUTDOWN_NODES_BOTH,
_SHUTDOWN_NODES_SEC):
if not names:
raise errors.OpPrereqError("No node names passed")
- op = opcodes.OpQueryNodes(output_fields=["name", "pinst_list",
- "sinst_list"], names=names)
- ndata = SubmitOpCode(op)
+ client = GetClient()
+ ndata = client.QueryNodes(names, ["name", "pinst_list", "sinst_list"])
ipri = [row[1] for row in ndata]
pri_names = list(itertools.chain(*ipri))
isec = [row[2] for row in ndata]
elif mode == _SHUTDOWN_INSTANCES:
if not names:
raise errors.OpPrereqError("No instance names passed")
- op = opcodes.OpQueryInstances(output_fields=["name"], names=names)
- idata = SubmitOpCode(op)
+ client = GetClient()
+ idata = client.QueryInstances(names, ["name"])
inames = [row[0] for row in idata]
else:
else:
selected_fields = opts.output.split(",")
- op = opcodes.OpQueryInstances(output_fields=selected_fields, names=[])
- output = SubmitOpCode(op)
+ output = GetClient().QueryInstances([], selected_fields)
if not opts.no_headers:
headers = {
"snodes": "Secondary_Nodes", "admin_state": "Autostart",
"oper_state": "Running", "admin_ram": "Configured_memory",
"oper_ram": "Memory", "disk_template": "Disk_template",
- "ip": "IP Address", "mac": "MAC Address",
+ "ip": "IP_address", "mac": "MAC_address",
"bridge": "Bridge", "vcpus": "VCPUs",
"sda_size": "Disk/0", "sdb_size": "Disk/1",
"status": "Status", "tags": "Tags",
+ "network_port": "Network_port",
+ "kernel_path": "Kernel_path",
+ "initrd_path": "Initrd_path",
+ "hvm_boot_order": "HVM_boot_order",
+ "hvm_acpi": "HVM_ACPI",
+ "hvm_pae": "HVM_PAE",
+ "hvm_cdrom_image_path": "HVM_CDROM_image_path",
+ "hvm_nic_type": "HVM_NIC_type",
+ "hvm_disk_type": "HVM_disk_type",
+ "vnc_bind_address": "VNC_bind_address",
}
else:
headers = None
file_driver=opts.file_driver,
hvm_acpi=hvm_acpi, hvm_pae=hvm_pae,
hvm_cdrom_image_path=hvm_cdrom_image_path,
- vnc_bind_address=opts.vnc_bind_address)
+ vnc_bind_address=opts.vnc_bind_address,
+ hvm_nic_type=opts.hvm_nic_type,
+ hvm_disk_type=opts.hvm_disk_type)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
"""
instance_name = args[0]
+ if opts.select_os is True:
+ op = opcodes.OpDiagnoseOS(output_fields=["name", "valid"], names=[])
+ result = SubmitOpCode(op)
+
+ if not result:
+ logger.ToStdout("Can't get the OS list")
+ return 1
+
+ logger.ToStdout("Available OS templates:")
+ number = 0
+ choices = []
+ for entry in result:
+ logger.ToStdout("%3s: %s" % (number, entry[0]))
+ choices.append(("%s" % number, entry[0], entry[0]))
+ number = number + 1
+
+ choices.append(('x', 'exit', 'Exit gnt-instance reinstall'))
+ selected = AskUser("Enter OS template name or number (or x to abort):",
+ choices)
+
+ if selected == 'exit':
+ logger.ToStdout("User aborted reinstall, exiting")
+ return 1
+
+ os = selected
+ else:
+ os = opts.os
+
if not opts.force:
usertext = ("This will reinstall the instance %s and remove"
" all data. Continue?") % instance_name
return 1
op = opcodes.OpReinstallInstance(instance_name=instance_name,
- os_type=opts.os)
- SubmitOpCode(op)
+ os_type=os)
+ SubmitOrSend(op, opts)
return 0
op = opcodes.OpRemoveInstance(instance_name=instance_name,
ignore_failures=opts.ignore_failures)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
op = opcodes.OpRenameInstance(instance_name=args[0],
new_name=args[1],
ignore_ip=opts.ignore_ip)
- SubmitOpCode(op)
-
+ SubmitOrSend(op, opts)
return 0
"""
instance_name = args[0]
op = opcodes.OpActivateInstanceDisks(instance_name=instance_name)
- disks_info = SubmitOpCode(op)
+ disks_info = SubmitOrSend(op, opts)
for host, iname, nname in disks_info:
print "%s:%s:%s" % (host, iname, nname)
return 0
"""
instance_name = args[0]
op = opcodes.OpDeactivateInstanceDisks(instance_name=instance_name)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
disk = args[1]
amount = utils.ParseUnit(args[2])
op = opcodes.OpGrowDisk(instance_name=instance, disk=disk, amount=amount)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
extra_args=opts.extra_args)
if multi_on:
logger.ToStdout("Starting up %s" % name)
- SubmitOpCode(op)
+ try:
+ SubmitOrSend(op, opts)
+ except JobSubmittedException, err:
+ _, txt = FormatError(err)
+ logger.ToStdout("%s" % txt)
return 0
reboot_type=opts.reboot_type,
ignore_secondaries=opts.ignore_secondaries)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
op = opcodes.OpShutdownInstance(instance_name=name)
if multi_on:
logger.ToStdout("Shutting down %s" % name)
- SubmitOpCode(op)
+ try:
+ SubmitOrSend(op, opts)
+ except JobSubmittedException, err:
+ _, txt = FormatError(err)
+ logger.ToStdout("%s" % txt)
return 0
op = opcodes.OpReplaceDisks(instance_name=args[0], disks=disks,
remote_node=new_2ndary, mode=mode,
iallocator=iallocator)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
op = opcodes.OpFailoverInstance(instance_name=instance_name,
ignore_consistency=opts.ignore_consistency)
- SubmitOpCode(op)
+ SubmitOrSend(op, opts)
return 0
if opts.show_command:
print utils.ShellQuoteArgs(cmd)
else:
- # drop lock and exec so other commands can run while we have console
- utils.Unlock("cmd")
try:
os.execvp(cmd[0], cmd)
finally:
op = opcodes.OpQueryInstanceData(instances=args)
result = SubmitOpCode(op)
hvm_parameters = ("hvm_acpi", "hvm_pae", "hvm_cdrom_image_path",
- "hvm_boot_order")
+ "hvm_boot_order", "hvm_nic_type", "hvm_disk_type")
pvm_parameters = ("kernel_path", "initrd_path")
buf.write(" - ACPI support: %s\n" % instance["hvm_acpi"])
buf.write(" - PAE support: %s\n" % instance["hvm_pae"])
buf.write(" - virtual CDROM: %s\n" % instance["hvm_cdrom_image_path"])
+ buf.write(" - virtual NIC type: %s\n" % instance["hvm_nic_type"])
+ buf.write(" - virtual disk type: %s\n" % instance["hvm_disk_type"])
if instance.has_key("vnc_bind_address"):
buf.write(" VNC bind address: %s\n" % instance["vnc_bind_address"])
+ buf.write(" VNC console port: %s\n" % instance["vnc_console_port"])
buf.write(" Hardware:\n")
buf.write(" - VCPUs: %d\n" % instance["vcpus"])
buf.write(" - memory: %dMiB\n" % instance["memory"])
if not (opts.mem or opts.vcpus or opts.ip or opts.bridge or opts.mac or
opts.kernel_path or opts.initrd_path or opts.hvm_boot_order or
opts.hvm_acpi or opts.hvm_pae or opts.hvm_cdrom_image_path or
- opts.vnc_bind_address):
+ opts.vnc_bind_address or opts.hvm_nic_type or opts.hvm_disk_type):
logger.ToStdout("Please give at least one of the parameters.")
return 1
else:
hvm_boot_order = opts.hvm_boot_order
- hvm_acpi = opts.hvm_acpi == _VALUE_TRUE
- hvm_pae = opts.hvm_pae == _VALUE_TRUE
+ if opts.hvm_acpi is None:
+ hvm_acpi = opts.hvm_acpi
+ else:
+ hvm_acpi = opts.hvm_acpi == _VALUE_TRUE
- if ((opts.hvm_cdrom_image_path is not None) and
- (opts.hvm_cdrom_image_path.lower() == constants.VALUE_NONE)):
- hvm_cdrom_image_path = None
+ if opts.hvm_pae is None:
+ hvm_pae = opts.hvm_pae
else:
- hvm_cdrom_image_path = opts.hvm_cdrom_image_path
+ hvm_pae = opts.hvm_pae == _VALUE_TRUE
+
+ if opts.hvm_nic_type == constants.VALUE_NONE:
+ hvm_nic_type = None
+ else:
+ hvm_nic_type = opts.hvm_nic_type
+
+ if opts.hvm_disk_type == constants.VALUE_NONE:
+ hvm_disk_type = None
+ else:
+ hvm_disk_type = opts.hvm_disk_type
op = opcodes.OpSetInstanceParams(instance_name=args[0], mem=opts.mem,
vcpus=opts.vcpus, ip=opts.ip,
initrd_path=opts.initrd_path,
hvm_boot_order=hvm_boot_order,
hvm_acpi=hvm_acpi, hvm_pae=hvm_pae,
- hvm_cdrom_image_path=hvm_cdrom_image_path,
- vnc_bind_address=opts.vnc_bind_address)
+ hvm_cdrom_image_path=
+ opts.hvm_cdrom_image_path,
+ vnc_bind_address=opts.vnc_bind_address,
+ hvm_nic_type=hvm_nic_type,
+ hvm_disk_type=hvm_disk_type,
+ force=opts.force)
- result = SubmitOpCode(op)
+ # even if here we process the result, we allow submit only
+ result = SubmitOrSend(op, opts)
if result:
logger.ToStdout("Modified instance %s" % args[0])
make_option("--hvm-acpi", dest="hvm_acpi",
help="ACPI support for HVM (true|false)",
metavar="<BOOL>", choices=["true", "false"]),
+ make_option("--hvm-nic-type", dest="hvm_nic_type",
+ help="Type of virtual NIC for HVM "
+ "(rtl8139,ne2k_pci,ne2k_isa,paravirtual)",
+ metavar="NICTYPE", choices=[constants.HT_HVM_NIC_RTL8139,
+ constants.HT_HVM_NIC_NE2K_PCI,
+ constants.HT_HVM_NIC_NE2K_ISA,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=constants.HT_HVM_NIC_RTL8139),
+ make_option("--hvm-disk-type", dest="hvm_disk_type",
+ help="Type of virtual disks for HVM (ioemu,paravirtual)",
+ metavar="DISKTYPE", choices=[constants.HT_HVM_DEV_IOEMU,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=constants.HT_HVM_DEV_IOEMU,),
make_option("--hvm-pae", dest="hvm_pae",
help="PAE support for HVM (true|false)",
metavar="<BOOL>", choices=["true", "false"]),
make_option("--vnc-bind-address", dest="vnc_bind_address",
help="bind address for VNC (IP address)",
default=None, type="string", metavar="<VNCADDRESS>"),
+ SUBMIT_OPT,
]
commands = {
action="store_true", default=False,
help="Ignore the consistency of the disks on"
" the secondary"),
+ SUBMIT_OPT,
],
"[-f] <instance>",
"Stops the instance and starts it on the backup node, using"
" ip, mac, bridge, sda_size, sdb_size, vcpus. The default field"
" list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS),
),
- 'reinstall': (ReinstallInstance, ARGS_ONE, [DEBUG_OPT, FORCE_OPT, os_opt],
+ 'reinstall': (ReinstallInstance, ARGS_ONE,
+ [DEBUG_OPT, FORCE_OPT, os_opt,
+ make_option("--select-os", dest="select_os",
+ action="store_true", default=False,
+ help="Interactive OS reinstall, lists available"
+ " OS templates for selection"),
+ SUBMIT_OPT,
+ ],
"[-f] <instance>", "Reinstall a stopped instance"),
'remove': (RemoveInstance, ARGS_ONE,
[DEBUG_OPT, FORCE_OPT,
help=("Remove the instance from the cluster even"
" if there are failures during the removal"
" process (shutdown, disk removal, etc.)")),
+ SUBMIT_OPT,
],
"[-f] <instance>", "Shuts down the instance and removes it"),
'rename': (RenameInstance, ARGS_FIXED(2),
help="Do not check that the IP of the new name"
" is alive",
default=False, action="store_true"),
+ SUBMIT_OPT,
],
"<instance> <new_name>", "Rename the instance"),
'replace-disks': (ReplaceDisks, ARGS_ONE,
" <NAME> iallocator plugin (enables"
" secondary node replacement)",
default=None, type="string"),
+ SUBMIT_OPT,
],
"[-s|-p|-n NODE] <instance>",
"Replaces all disks for the instance"),
help="CDROM image path for HVM"
"(absolute path or None)",
default=None, type="string", metavar="<CDROMIMAGE>"),
+ make_option("--hvm-nic-type", dest="hvm_nic_type",
+ help="Type of virtual NIC for HVM "
+ "(rtl8139,ne2k_pci,ne2k_isa,paravirtual)",
+ metavar="NICTYPE",
+ choices=[constants.HT_HVM_NIC_RTL8139,
+ constants.HT_HVM_NIC_NE2K_PCI,
+ constants.HT_HVM_NIC_NE2K_ISA,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=None),
+ make_option("--hvm-disk-type", dest="hvm_disk_type",
+ help="Type of virtual disks for HVM "
+ "(ioemu,paravirtual)",
+ metavar="DISKTYPE",
+ choices=[constants.HT_HVM_DEV_IOEMU,
+ constants.HT_HVM_DEV_PARAVIRTUAL],
+ default=None),
make_option("--vnc-bind-address", dest="vnc_bind_address",
help="bind address for VNC (IP address)",
default=None, type="string", metavar="<VNCADDRESS>"),
+ SUBMIT_OPT,
],
"<instance>", "Alters the parameters of an instance"),
'shutdown': (ShutdownInstance, ARGS_ANY,
[DEBUG_OPT, m_node_opt, m_pri_node_opt, m_sec_node_opt,
- m_clust_opt, m_inst_opt, m_force_multi],
+ m_clust_opt, m_inst_opt, m_force_multi,
+ SUBMIT_OPT,
+ ],
"<instance>", "Stops an instance"),
'startup': (StartupInstance, ARGS_ANY,
[DEBUG_OPT, FORCE_OPT, m_force_multi,
default=None, type="string", metavar="<PARAMS>"),
m_node_opt, m_pri_node_opt, m_sec_node_opt,
m_clust_opt, m_inst_opt,
+ SUBMIT_OPT,
],
"<instance>", "Starts an instance"),
help="Ignore errors from secondaries"),
m_node_opt, m_pri_node_opt, m_sec_node_opt,
m_clust_opt, m_inst_opt,
+ SUBMIT_OPT,
],
"<instance>", "Reboots an instance"),
- 'activate-disks': (ActivateDisks, ARGS_ONE, [DEBUG_OPT],
+ 'activate-disks': (ActivateDisks, ARGS_ONE, [DEBUG_OPT, SUBMIT_OPT],
"<instance>",
"Activate an instance's disks"),
- 'deactivate-disks': (DeactivateDisks, ARGS_ONE, [DEBUG_OPT],
+ 'deactivate-disks': (DeactivateDisks, ARGS_ONE, [DEBUG_OPT, SUBMIT_OPT],
"<instance>",
"Deactivate an instance's disks"),
- 'grow-disk': (GrowDisk, ARGS_FIXED(3), [DEBUG_OPT],
+ 'grow-disk': (GrowDisk, ARGS_FIXED(3), [DEBUG_OPT, SUBMIT_OPT],
"<instance> <disk> <size>", "Grow an instance's disk"),
'list-tags': (ListTags, ARGS_ONE, [DEBUG_OPT],
- "<node_name>", "List the tags of the given instance"),
+ "<instance_name>", "List the tags of the given instance"),
'add-tags': (AddTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT],
- "<node_name> tag...", "Add tags to the given instance"),
+ "<instance_name> tag...", "Add tags to the given instance"),
'remove-tags': (RemoveTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT],
- "<node_name> tag...", "Remove tags from given instance"),
+ "<instance_name> tag...", "Remove tags from given instance"),
}
aliases = {
projects / ganeti-local / blobdiff