Merge branch 'stable-2.9' into stable-2.10

[ganeti-local] / man / gnt-instance.rst

diff --git a/man/gnt-instance.rst b/man/gnt-instance.rst
index cb65744..0174a65 100644 (file)
--- a/man/gnt-instance.rst
+++ b/man/gnt-instance.rst
@@ -27,8 +27,8 @@ ADD
 ^^^
 
 | **add**
 ^^^
 
 | **add**

-| {-t|\--disk-template {diskless | file \| plain \| drbd \| rbd}}
-| {\--disk=*N*: {size=*VAL* \| adopt=*LV*}[,options...]
+| {-t|\--disk-template {diskless \| file \| plain \| drbd \| rbd}}
+| {\--disk=*N*: {size=*VAL*[,spindles=*VAL*] \| adopt=*LV*}[,options...]

 |  \| {size=*VAL*,provider=*PROVIDER*}[,param=*value*... ][,options...]
 |  \| {-s|\--os-size} *SIZE*}
 | [\--no-ip-check] [\--no-name-check] [\--no-conflicts-check]
 |  \| {size=*VAL*,provider=*PROVIDER*}[,param=*value*... ][,options...]
 |  \| {-s|\--os-size} *SIZE*}
 | [\--no-ip-check] [\--no-name-check] [\--no-conflicts-check]

@@ -37,11 +37,12 @@ ADD
 | [{-B|\--backend-parameters} *BEPARAMS*]
 | [{-H|\--hypervisor-parameters} *HYPERVISOR* [: option=*value*... ]]
 | [{-O|\--os-parameters} *param*=*value*... ]
 | [{-B|\--backend-parameters} *BEPARAMS*]
 | [{-H|\--hypervisor-parameters} *HYPERVISOR* [: option=*value*... ]]
 | [{-O|\--os-parameters} *param*=*value*... ]

-| [\--file-storage-dir *dir\_path*] [\--file-driver {loop \| blktap}]
+| [\--file-storage-dir *dir\_path*] [\--file-driver {loop \| blktap \| blktap2}]

 | {{-n|\--node} *node[:secondary-node]* \| {-I|\--iallocator} *name*}
 | {{-o|\--os-type} *os-type*}
 | {{-n|\--node} *node[:secondary-node]* \| {-I|\--iallocator} *name*}
 | {{-o|\--os-type} *os-type*}

-| [\--submit]
+| [\--submit] [\--print-job-id]

 | [\--ignore-ipolicy]
 | [\--ignore-ipolicy]

+| [\--no-wait-for-sync]

 | {*instance*}
 
 Creates a new instance on the specified host. The *instance* argument
 | {*instance*}
 
 Creates a new instance on the specified host. The *instance* argument

@@ -57,12 +58,15 @@ given) in mebibytes. You can also use one of the suffixes *m*, *g* or
 mebibytes, gibibytes and tebibytes. Each disk can also take these
 parameters (all optional):
 
 mebibytes, gibibytes and tebibytes. Each disk can also take these
 parameters (all optional):
 

+spindles
+  How many spindles (physical disks on the node) the disk should span.
+

 mode
   The access mode. Either ``ro`` (read-only) or the default ``rw``
   (read-write).
 
 name
 mode
   The access mode. Either ``ro`` (read-only) or the default ``rw``
   (read-write).
 
 name

-   this option specifies a name for the disk, which can be used as a disk
+   This option specifies a name for the disk, which can be used as a disk

    identifier. An instance can not have two disks with the same name.
 
 vg
    identifier. An instance can not have two disks with the same name.
 
 vg

@@ -132,6 +136,9 @@ ip
     connected to the said network. ``--no-conflicts-check`` can be used
     to override this check. The special value **pool** causes Ganeti to
     select an IP from the the network the NIC is or will be connected to.
     connected to the said network. ``--no-conflicts-check`` can be used
     to override this check. The special value **pool** causes Ganeti to
     select an IP from the the network the NIC is or will be connected to.

+    One can pick an externally reserved IP of a network along with
+    ``--no-conflict-check``. Note that this IP cannot be assigned to
+    any other instance until it gets released.

 
 mode
     specifies the connection mode for this NIC: routed, bridged or
 
 mode
     specifies the connection mode for this NIC: routed, bridged or

@@ -157,6 +164,11 @@ name
    this option specifies a name for the NIC, which can be used as a NIC
    identifier. An instance can not have two NICs with the same name.
 
    this option specifies a name for the NIC, which can be used as a NIC
    identifier. An instance can not have two NICs with the same name.
 

+vlan
+   in openvswitch mode specifies the VLANs that the NIC will be
+   connected to. To connect as an access port use ``n`` or ``.n`` with
+   **n** being the VLAN ID. To connect as an trunk port use ``:n[:n]``.
+   A hybrid port can be created with ``.n:n[:n]``

 
 Of these "mode" and "link" are NIC parameters, and inherit their
 default at cluster level.  Alternatively, if no network is desired for
 
 Of these "mode" and "link" are NIC parameters, and inherit their
 default at cluster level.  Alternatively, if no network is desired for

@@ -303,7 +315,8 @@ disk\_type
     instance. The possible options are:
 
     - ioemu [default] (HVM & KVM)
     instance. The possible options are:
 
     - ioemu [default] (HVM & KVM)

-    - ide (HVM & KVM)
+    - paravirtual (HVM & KVM)
+    - ide (KVM)

     - scsi (KVM)
     - sd (KVM)
     - mtd (KVM)
     - scsi (KVM)
     - sd (KVM)
     - mtd (KVM)

@@ -334,6 +347,14 @@ vnc\_bind\_address
     or specify the address of one of the interfaces on the node to
     restrict listening to that interface.
 
     or specify the address of one of the interfaces on the node to
     restrict listening to that interface.
 

+vnc\_password\_file
+    Valid for the Xen HVM and KVM hypervisors.
+
+    Specifies the location of the file containing the password for
+    connections using VNC. The default is a file named
+    vnc-cluster-password which can be found in the configuration
+    directory.
+

 vnc\_tls
     Valid for the KVM hypervisor.
 
 vnc\_tls
     Valid for the KVM hypervisor.
 

@@ -715,18 +736,34 @@ cpu\_sockets
     Number of emulated CPU sockets.
 
 soundhw
     Number of emulated CPU sockets.
 
 soundhw

-    Valid for the KVM hypervisor.
+    Valid for the KVM and XEN hypervisors.

 
     Comma separated list of emulated sounds cards, or "all" to enable
     all the available ones.
 
 
     Comma separated list of emulated sounds cards, or "all" to enable
     all the available ones.
 

+cpuid
+    Valid for the XEN hypervisor.
+
+    Modify the values returned by CPUID_ instructions run within instances.
+
+    This allows you to enable migration between nodes with different CPU
+    attributes like cores, threads, hyperthreading or SS4 support by hiding
+    the extra features where needed.
+
+    See the XEN documentation for syntax and more information.
+
+.. _CPUID: http://en.wikipedia.org/wiki/CPUID
+

 usb\_devices
     Valid for the KVM hypervisor.
 
 usb\_devices
     Valid for the KVM hypervisor.
 

-    Comma separated list of usb devices. These can be emulated devices
+    Space separated list of usb devices. These can be emulated devices

     or passthrough ones, and each one gets passed to kvm with its own
     ``-usbdevice`` option. See the **qemu**\(1) manpage for the syntax
     or passthrough ones, and each one gets passed to kvm with its own
     ``-usbdevice`` option. See the **qemu**\(1) manpage for the syntax

-    of the possible components.
+    of the possible components. Note that values set with this
+    parameter are split on a space character and currently don't support
+    quoting. For backwards compatibility reasons, the RAPI interface keeps
+    accepting comma separated lists too.

 
 vga
     Valid for the KVM hypervisor.
 
 vga
     Valid for the KVM hypervisor.

@@ -780,7 +817,10 @@ don't need to pass them with the ``-n`` option. For more information
 please refer to the instance allocator documentation.
 
 The ``-t (--disk-template)`` options specifies the disk layout type
 please refer to the instance allocator documentation.
 
 The ``-t (--disk-template)`` options specifies the disk layout type

-for the instance.  The available choices are:
+for the instance. If no disk template is specified, the default disk
+template is used. The default disk template is the first in the list
+of enabled disk templates, which can be adjusted cluster-wide with
+``gnt-cluster modify``. The available choices for disk templates are:

 
 diskless
     This creates an instance with no disks. Its useful for testing only
 
 diskless
     This creates an instance with no disks. Its useful for testing only

@@ -819,9 +859,8 @@ cluster-wide file storage directory to store file-based disks. It is
 useful for having different subdirectories for different
 instances. The full path of the directory where the disk files are
 stored will consist of cluster-wide file storage directory + optional
 useful for having different subdirectories for different
 instances. The full path of the directory where the disk files are
 stored will consist of cluster-wide file storage directory + optional

-subdirectory + instance name. Example:
-``@RPL_FILE_STORAGE_DIR@/mysubdir/instance1.example.com``. This
-option is only relevant for instances using the file storage backend.
+subdirectory + instance name. This option is only relevant for
+instances using the file storage backend.

 
 The ``--file-driver`` specifies the driver to use for file-based
 disks. Note that currently these drivers work with the xen hypervisor
 
 The ``--file-driver`` specifies the driver to use for file-based
 disks. Note that currently these drivers work with the xen hypervisor

@@ -844,6 +883,9 @@ blktap
     better performance. Especially if you use a network file system
     (e.g. NFS) to store your instances this is the recommended choice.
 
     better performance. Especially if you use a network file system
     (e.g. NFS) to store your instances this is the recommended choice.
 

+blktap2
+    Analogous to the blktap driver, but used by newer versions of Xen.
+

 If ``--ignore-ipolicy`` is given any instance policy violations occuring
 during this operation are ignored.
 
 If ``--ignore-ipolicy`` is given any instance policy violations occuring
 during this operation are ignored.
 

@@ -969,11 +1011,19 @@ follows::
     # gnt-instance batch-create instances.json
     Submitted jobs 37, 38
 
     # gnt-instance batch-create instances.json
     Submitted jobs 37, 38
 

+
+Note: If the allocator is used for computing suitable nodes for the
+instances, it will only take into account disk information for the
+default disk template. That means, even if other disk templates are
+specified for the instances, storage space information of these disk
+templates will not be considered in the allocation computation.
+
+

 REMOVE
 ^^^^^^
 
 REMOVE
 ^^^^^^
 

-**remove** [\--ignore-failures] [\--shutdown-timeout=*N*] [\--submit]
-[\--force] {*instance*}
+| **remove** [\--ignore-failures] [\--shutdown-timeout=*N*] [\--submit]
+| [\--print-job-id] [\--force] {*instance*}

 
 Remove an instance. This will remove all data from the instance and
 there is *no way back*. If you are not sure if you use an instance
 
 Remove an instance. This will remove all data from the instance and
 there is *no way back*. If you are not sure if you use an instance

@@ -1098,13 +1148,15 @@ MODIFY
 |  \--disk *N*:add,size=*SIZE*,provider=*PROVIDER*[,options...][,param=*value*... ] \|
 |  \--disk *ID*:modify[,options...]
 |  \--disk [*ID*:]remove]
 |  \--disk *N*:add,size=*SIZE*,provider=*PROVIDER*[,options...][,param=*value*... ] \|
 |  \--disk *ID*:modify[,options...]
 |  \--disk [*ID*:]remove]

-| [{-t|\--disk-template} plain | {-t|\--disk-template} drbd -n *new_secondary*] [\--no-wait-for-sync]
+| [{-t|\--disk-template} plain \| {-t|\--disk-template} drbd -n *new_secondary*] [\--no-wait-for-sync]

 | [\--new-primary=*node*]
 | [\--os-type=*OS* [\--force-variant]]
 | [{-O|\--os-parameters} *param*=*value*... ]
 | [\--offline \| \--online]
 | [\--new-primary=*node*]
 | [\--os-type=*OS* [\--force-variant]]
 | [{-O|\--os-parameters} *param*=*value*... ]
 | [\--offline \| \--online]

-| [\--submit]
+| [\--submit] [\--print-job-id]

 | [\--ignore-ipolicy]
 | [\--ignore-ipolicy]

+| [\--hotplug]
+| [\--hotplug-if-possible]

 | {*instance*}
 
 Modifies the memory size, number of vcpus, ip address, MAC address
 | {*instance*}
 
 Modifies the memory size, number of vcpus, ip address, MAC address

@@ -1133,22 +1185,24 @@ by ballooning it up or down to the new value.
 The ``--disk add:size=*SIZE*,[options..]`` option adds a disk to the
 instance, and ``--disk *N*:add:size=*SIZE*,[options..]`` will add a disk
 to the the instance at a specific index. The available options are the
 The ``--disk add:size=*SIZE*,[options..]`` option adds a disk to the
 instance, and ``--disk *N*:add:size=*SIZE*,[options..]`` will add a disk
 to the the instance at a specific index. The available options are the

-same as in the **add** command(``mode``, ``name``, ``vg``, ``metavg``).
-When adding an ExtStorage disk the ``provider=*PROVIDER*`` option is
+same as in the **add** command(``spindles``, ``mode``, ``name``, ``vg``,
+``metavg``). Per default, gnt-instance waits for the disk mirror to sync.
+If you do not want this behavior, use the ``--no-wait-for-sync`` option.
+When adding an ExtStorage disk, the ``provider=*PROVIDER*`` option is

 also mandatory and specifies the ExtStorage provider. Also, for
 ExtStorage disks arbitrary parameters can be passed as additional comma
 also mandatory and specifies the ExtStorage provider. Also, for
 ExtStorage disks arbitrary parameters can be passed as additional comma

-separated options, same as in the **add** command. -The ``--disk remove``
+separated options, same as in the **add** command. The ``--disk remove``

 option will remove the last disk of the instance. Use
 option will remove the last disk of the instance. Use

-``--disk `` *ID*``:remove`` to remove a disk by its identifier.  *ID*
-can be the index of the disk, the disks's name or the disks's UUID.  The
-``--disk *ID*:modify[,options...]`` wil change the options of the disk.
+``--disk `` *ID*``:remove`` to remove a disk by its identifier. *ID*
+can be the index of the disk, the disks's name or the disks's UUID. The
+``--disk *ID*:modify[,options...]`` will change the options of the disk.

 Available options are:
 
 mode
   The access mode. Either ``ro`` (read-only) or the default ``rw`` (read-write).
 
 name
 Available options are:
 
 mode
   The access mode. Either ``ro`` (read-only) or the default ``rw`` (read-write).
 
 name

-   this option specifies a name for the disk, which can be used as a disk
+   This option specifies a name for the disk, which can be used as a disk

    identifier. An instance can not have two disks with the same name.
 
 The ``--net *N*:add[,options..]`` will add a new network interface to
    identifier. An instance can not have two disks with the same name.
 
 The ``--net *N*:add[,options..]`` will add a new network interface to

@@ -1180,6 +1234,21 @@ immediately.
 If ``--ignore-ipolicy`` is given any instance policy violations occuring
 during this operation are ignored.
 
 If ``--ignore-ipolicy`` is given any instance policy violations occuring
 during this operation are ignored.
 

+If ``--hotplug`` is given any disk and NIC modifications will take
+effect without the need of actual reboot. Please note that this feature
+is currently supported only for KVM hypervisor and there are some
+restrictions: a) KVM versions >= 1.0 support it b) instances with chroot
+or uid pool security model do not support disk hotplug c) RBD disks with
+userspace access mode can not be hotplugged (yet) d) if hotplug fails
+(for any reason) a warning is printed but execution is continued e)
+for existing NIC modification interactive verification is needed unless
+``--force`` option is passed.
+
+If ``--hotplug-if-possible`` is given then ganeti won't abort in case
+hotplug is not supported. It will continue execution and modification
+will take place after reboot. This covers use cases where instances are
+not running or hypervisor is not KVM.
+

 See **ganeti**\(7) for a description of ``--submit`` and other common
 options.
 
 See **ganeti**\(7) for a description of ``--submit`` and other common
 options.
 

@@ -1192,7 +1261,8 @@ REINSTALL
 | **reinstall** [{-o|\--os-type} *os-type*] [\--select-os] [-f *force*]
 | [\--force-multiple]
 | [\--instance \| \--node \| \--primary \| \--secondary \| \--all]
 | **reinstall** [{-o|\--os-type} *os-type*] [\--select-os] [-f *force*]
 | [\--force-multiple]
 | [\--instance \| \--node \| \--primary \| \--secondary \| \--all]

-| [{-O|\--os-parameters} *OS\_PARAMETERS*] [\--submit] {*instance*...}
+| [{-O|\--os-parameters} *OS\_PARAMETERS*] [\--submit] [\--print-job-id]
+| {*instance*...}

 
 Reinstalls the operating system on the given instance(s). The
 instance(s) must be stopped when running this command. If the ``-o
 
 Reinstalls the operating system on the given instance(s). The
 instance(s) must be stopped when running this command. If the ``-o

@@ -1217,7 +1287,7 @@ options.
 RENAME
 ^^^^^^
 
 RENAME
 ^^^^^^
 

-| **rename** [\--no-ip-check] [\--no-name-check] [\--submit]
+| **rename** [\--no-ip-check] [\--no-name-check] [\--submit] [\--print-job-id]

 | {*instance*} {*new\_name*}
 
 Renames the given instance. The instance must be stopped when running
 | {*instance*} {*new\_name*}
 
 Renames the given instance. The instance must be stopped when running

@@ -1253,7 +1323,7 @@ STARTUP
 | \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]
 | [{-H|\--hypervisor-parameters} ``key=value...``]
 | [{-B|\--backend-parameters} ``key=value...``]
 | \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]
 | [{-H|\--hypervisor-parameters} ``key=value...``]
 | [{-B|\--backend-parameters} ``key=value...``]

-| [\--submit] [\--paused]
+| [\--submit] [\--print-job-id] [\--paused]

 | {*name*...}
 
 Starts one or more instances, depending on the following options.  The
 | {*name*...}
 
 Starts one or more instances, depending on the following options.  The

@@ -1351,7 +1421,7 @@ SHUTDOWN
 | [\--force] [\--force-multiple] [\--ignore-offline] [\--no-remember]
 | [\--instance \| \--node \| \--primary \| \--secondary \| \--all \|
 | \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]
 | [\--force] [\--force-multiple] [\--ignore-offline] [\--no-remember]
 | [\--instance \| \--node \| \--primary \| \--secondary \| \--all \|
 | \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]

-| [\--submit]
+| [\--submit] [\--print-job-id]

 | {*name*...}
 
 Stops one or more instances. If the instance cannot be cleanly stopped
 | {*name*...}
 
 Stops one or more instances. If the instance cannot be cleanly stopped

@@ -1405,7 +1475,7 @@ REBOOT
 | [\--force-multiple]
 | [\--instance \| \--node \| \--primary \| \--secondary \| \--all \|
 | \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]
 | [\--force-multiple]
 | [\--instance \| \--node \| \--primary \| \--secondary \| \--all \|
 | \--tags \| \--node-tags \| \--pri-node-tags \| \--sec-node-tags]

-| [\--submit]
+| [\--submit] [\--print-job-id]

 | [*name*...]
 
 Reboots one or more instances. The type of reboot depends on the value
 | [*name*...]
 
 Reboots one or more instances. The type of reboot depends on the value

@@ -1469,17 +1539,18 @@ Disk management
 REPLACE-DISKS
 ^^^^^^^^^^^^^
 
 REPLACE-DISKS
 ^^^^^^^^^^^^^
 

-**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy] {-p}
-[\--disks *idx*] {*instance*}
+| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
+| [\--ignore-ipolicy] {-p} [\--disks *idx*] {*instance*}

 
 

-**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy] {-s}
-[\--disks *idx*] {*instance*}
+| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
+| [\--ignore-ipolicy] {-s} [\--disks *idx*] {*instance*}

 
 

-**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
-{{-I\|\--iallocator} *name* \| {{-n|\--new-secondary} *node* } {*instance*}
+| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
+| [\--ignore-ipolicy]
+| {{-I\|\--iallocator} *name* \| {{-n|\--new-secondary} *node* } {*instance*}

 
 

-**replace-disks** [\--submit] [\--early-release] [\--ignore-ipolicy]
-{-a\|\--auto} {*instance*}
+| **replace-disks** [\--submit] [\--print-job-id] [\--early-release]
+| [\--ignore-ipolicy] {-a\|\--auto} {*instance*}

 
 This command is a generalized form for replacing disks. It is
 currently only valid for the mirrored (DRBD) disk template.
 
 This command is a generalized form for replacing disks. It is
 currently only valid for the mirrored (DRBD) disk template.

@@ -1527,7 +1598,8 @@ options.
 ACTIVATE-DISKS
 ^^^^^^^^^^^^^^
 
 ACTIVATE-DISKS
 ^^^^^^^^^^^^^^
 

-**activate-disks** [\--submit] [\--ignore-size] [\--wait-for-sync] {*instance*}
+| **activate-disks** [\--submit] [\--print-job-id] [\--ignore-size]
+| [\--wait-for-sync] {*instance*}

 
 Activates the block devices of the given instance. If successful, the
 command will show the location and name of the block devices::
 
 Activates the block devices of the given instance. If successful, the
 command will show the location and name of the block devices::

@@ -1565,7 +1637,7 @@ options.
 DEACTIVATE-DISKS
 ^^^^^^^^^^^^^^^^
 
 DEACTIVATE-DISKS
 ^^^^^^^^^^^^^^^^
 

-**deactivate-disks** [-f] [\--submit] {*instance*}
+**deactivate-disks** [-f] [\--submit] [\--print-job-id] {*instance*}

 
 De-activates the block devices of the given instance. Note that if you
 run this command for an instance with a drbd disk template, while it
 
 De-activates the block devices of the given instance. Note that if you
 run this command for an instance with a drbd disk template, while it

@@ -1586,7 +1658,8 @@ options.
 GROW-DISK
 ^^^^^^^^^
 
 GROW-DISK
 ^^^^^^^^^
 

-| **grow-disk** [\--no-wait-for-sync] [\--submit] [\--absolute]
+| **grow-disk** [\--no-wait-for-sync] [\--submit] [\--print-job-id]
+| [\--absolute]

 | {*instance*} {*disk*} {*amount*}
 
 Grows an instance's disk. This is only possible for instances having a
 | {*instance*} {*disk*} {*amount*}
 
 Grows an instance's disk. This is only possible for instances having a

@@ -1644,9 +1717,9 @@ instance.
 RECREATE-DISKS
 ^^^^^^^^^^^^^^
 
 RECREATE-DISKS
 ^^^^^^^^^^^^^^
 

-| **recreate-disks** [\--submit]
+| **recreate-disks** [\--submit] [\--print-job-id]

 | [{-n node1:[node2] \| {-I\|\--iallocator *name*}}]
 | [{-n node1:[node2] \| {-I\|\--iallocator *name*}}]

-| [\--disk=*N*[:[size=*VAL*][,mode=*ro\|rw*]]] {*instance*}
+| [\--disk=*N*[:[size=*VAL*][,spindles=*VAL*][,mode=*ro\|rw*]]] {*instance*}

 
 Recreates all or a subset of disks of the given instance.
 
 
 Recreates all or a subset of disks of the given instance.
 

@@ -1657,10 +1730,10 @@ normal operation and as such the impact of this is low.
 
 If only a subset should be recreated, any number of ``disk`` options can
 be specified. It expects a disk index and an optional list of disk
 
 If only a subset should be recreated, any number of ``disk`` options can
 be specified. It expects a disk index and an optional list of disk

-parameters to change. Only ``size`` and ``mode`` can be changed while
-recreating disks. To recreate all disks while changing parameters on
-a subset only, a ``--disk`` option must be given for every disk of the
-instance.
+parameters to change. Only ``size``, ``spindles``, and ``mode`` can be
+changed while recreating disks. To recreate all disks while changing
+parameters on a subset only, a ``--disk`` option must be given for every
+disk of the instance.

 
 Optionally the instance's disks can be recreated on different
 nodes. This can be useful if, for example, the original nodes of the
 
 Optionally the instance's disks can be recreated on different
 nodes. This can be useful if, for example, the original nodes of the

@@ -1688,7 +1761,8 @@ FAILOVER
 | **failover** [-f] [\--ignore-consistency] [\--ignore-ipolicy]
 | [\--shutdown-timeout=*N*]
 | [{-n|\--target-node} *node* \| {-I|\--iallocator} *name*]
 | **failover** [-f] [\--ignore-consistency] [\--ignore-ipolicy]
 | [\--shutdown-timeout=*N*]
 | [{-n|\--target-node} *node* \| {-I|\--iallocator} *name*]

-| [\--submit] [\--cleanup]
+| [\--cleanup]
+| [\--submit] [\--print-job-id]

 | {*instance*}
 
 Failover will stop the instance (if running), change its primary node,
 | {*instance*}
 
 Failover will stop the instance (if running), change its primary node,

@@ -1748,10 +1822,10 @@ MIGRATE
 
 | **migrate** [-f] [\--allow-failover] [\--non-live]
 | [\--migration-mode=live\|non-live] [\--ignore-ipolicy]
 
 | **migrate** [-f] [\--allow-failover] [\--non-live]
 | [\--migration-mode=live\|non-live] [\--ignore-ipolicy]

-| [\--no-runtime-changes] [\--submit]
+| [\--no-runtime-changes] [\--submit] [\--print-job-id]

 | [{-n|\--target-node} *node* \| {-I|\--iallocator} *name*] {*instance*}
 
 | [{-n|\--target-node} *node* \| {-I|\--iallocator} *name*] {*instance*}
 

-| **migrate** [-f] \--cleanup [\--submit] {*instance*}
+| **migrate** [-f] \--cleanup [\--submit] [\--print-job-id] {*instance*}

 
 Migrate will move the instance to its secondary node without shutdown.
 As with failover, it works for instances having the drbd disk template
 
 Migrate will move the instance to its secondary node without shutdown.
 As with failover, it works for instances having the drbd disk template

@@ -1841,7 +1915,8 @@ MOVE
 ^^^^
 
 | **move** [-f] [\--ignore-consistency]
 ^^^^
 
 | **move** [-f] [\--ignore-consistency]

-| [-n *node*] [\--shutdown-timeout=*N*] [\--submit] [\--ignore-ipolicy]
+| [-n *node*] [\--shutdown-timeout=*N*] [\--submit] [\--print-job-id]
+| [\--ignore-ipolicy]

 | {*instance*}
 
 Move will move the instance to an arbitrary node in the cluster. This
 | {*instance*}
 
 Move will move the instance to an arbitrary node in the cluster. This

@@ -1874,12 +1949,14 @@ Example::
 CHANGE-GROUP
 ^^^^^^^^^^^^
 
 CHANGE-GROUP
 ^^^^^^^^^^^^
 

-| **change-group** [\--submit]
+| **change-group** [\--submit] [\--print-job-id]

 | [\--iallocator *NAME*] [\--to *GROUP*...] {*instance*}
 
 This command moves an instance to another node group. The move is
 calculated by an iallocator, either given on the command line or as a
 | [\--iallocator *NAME*] [\--to *GROUP*...] {*instance*}
 
 This command moves an instance to another node group. The move is
 calculated by an iallocator, either given on the command line or as a

-cluster default.
+cluster default. Note that the iallocator does only consider disk
+information of the default disk template, even if the instances'
+disk templates differ from that.

 
 If no specific destination groups are specified using ``--to``, all
 groups except the one containing the instance are considered.
 
 If no specific destination groups are specified using ``--to``, all
 groups except the one containing the instance are considered.