Commit 20b1bd80 authored by Iustin Pop's avatar Iustin Pop
Browse files

A couple of doc updates



Clarify the fact that temporary HV/BE params in instance start override
and do not extend the configured parameters; and change the instance
list headers from HVM_* to * since many of the parameters apply to KVM
too. Also fix a typo in the rapi documention for '/2/nodes'.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent a426508d
......@@ -599,11 +599,11 @@ Example::
[
{
"id": "node1.example.com",
"uri": "\/instances\/node1.example.com"
"uri": "\/nodes\/node1.example.com"
},
{
"id": "node2.example.com",
"uri": "\/instances\/node2.example.com"
"uri": "\/nodes\/node2.example.com"
}
]
......
......@@ -1511,10 +1511,10 @@ instance5: 11225
<para>
The <option>-H</option> and <option>-B</option> options
specify extra, temporary hypervisor and backend parameters
that can be used to start an instance with modified
parameters. They can be useful for quick testing without
having to modify an instance back and forth, e.g.:
specify temporary hypervisor and backend parameters that can
be used to start an instance with modified parameters. They
can be useful for quick testing without having to modify an
instance back and forth, e.g.:
<screen>
# gnt-instance start -H root_args="single" instance1
# gnt-instance start -B memory=2048 instance2
......@@ -1523,7 +1523,11 @@ instance5: 11225
<userinput>instance1</userinput> in single-user mode, and
the instance <userinput>instance2</userinput> with 2GB of
RAM (this time only, unless that is the actual instance
memory size already).
memory size already). Note that the values override the
instance parameters (and not extend them): an instance with
"root_args=ro" when started with <userinput>-H
root_args=single</userinput> will result in "single", not
"ro single".
</para>
<para>
......
......@@ -241,12 +241,12 @@ def ListInstances(opts, args):
"network_port": "Network_port",
"hv/kernel_path": "Kernel_path",
"hv/initrd_path": "Initrd_path",
"hv/boot_order": "HVM_boot_order",
"hv/acpi": "HVM_ACPI",
"hv/pae": "HVM_PAE",
"hv/cdrom_image_path": "HVM_CDROM_image_path",
"hv/nic_type": "HVM_NIC_type",
"hv/disk_type": "HVM_Disk_type",
"hv/boot_order": "Boot_order",
"hv/acpi": "ACPI",
"hv/pae": "PAE",
"hv/cdrom_image_path": "CDROM_image_path",
"hv/nic_type": "NIC_type",
"hv/disk_type": "Disk_type",
"hv/vnc_bind_address": "VNC_bind_address",
"serial_no": "SerialNo", "hypervisor": "Hypervisor",
"hvparams": "Hypervisor_parameters",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment