Revision d027b72b
| b/lib/cli.py | ||
|---|---|---|
| 1751 | 1751 |
NONICS_OPT, |
| 1752 | 1752 |
NWSYNC_OPT, |
| 1753 | 1753 |
OSPARAMS_OPT, |
| 1754 |
OSPARAMS_PRIVATE_OPT, |
|
| 1755 |
OSPARAMS_SECRET_OPT, |
|
| 1754 | 1756 |
OS_SIZE_OPT, |
| 1755 | 1757 |
SUBMIT_OPT, |
| 1756 | 1758 |
PRINT_JOBID_OPT, |
| ... | ... | |
| 2755 | 2757 |
utils.ForceDictType(hvparams, constants.HVS_PARAMETER_TYPES) |
| 2756 | 2758 |
FixHvParams(hvparams) |
| 2757 | 2759 |
|
| 2760 |
osparams_private = opts.osparams_private or serializer.PrivateDict() |
|
| 2761 |
osparams_secret = opts.osparams_secret or serializer.PrivateDict() |
|
| 2762 |
|
|
| 2758 | 2763 |
if mode == constants.INSTANCE_CREATE: |
| 2759 | 2764 |
start = opts.start |
| 2760 | 2765 |
os_type = opts.os |
| ... | ... | |
| 2778 | 2783 |
else: |
| 2779 | 2784 |
raise errors.ProgrammerError("Invalid creation mode %s" % mode)
|
| 2780 | 2785 |
|
| 2781 |
osparams_private = opts.osparams_private or serializer.PrivateDict() |
|
| 2782 |
osparams_secret = opts.osparams_private or serializer.PrivateDict() |
|
| 2783 |
|
|
| 2784 | 2786 |
op = opcodes.OpInstanceCreate(instance_name=instance, |
| 2785 | 2787 |
disks=disks, |
| 2786 | 2788 |
disk_template=opts.disk_template, |
| b/lib/client/gnt_instance.py | ||
|---|---|---|
| 1488 | 1488 |
commands = {
|
| 1489 | 1489 |
"add": ( |
| 1490 | 1490 |
AddInstance, [ArgHost(min=1, max=1)], |
| 1491 |
COMMON_CREATE_OPTS + add_opts + [OSPARAMS_PRIVATE_OPT, OSPARAMS_SECRET_OPT],
|
|
| 1491 |
COMMON_CREATE_OPTS + add_opts, |
|
| 1492 | 1492 |
"[...] -t disk-type -n node[:secondary-node] -o os-type <name>", |
| 1493 | 1493 |
"Creates and adds a new instance to the cluster"), |
| 1494 | 1494 |
"batch-create": ( |
Also available in: Unified diff