Commit 5645d16b authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix QA and documentation about no initrd case



In Ganeti 1.2, “none” was used to signify no initrd. In 2.0 we have
changed to “no_” as a prefix (i.e. “-H no_initrd_path”) and thus we
document in the manpage this.

The QA suite is changed accordingly.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent dad1e806
...@@ -460,7 +460,10 @@ ...@@ -460,7 +460,10 @@
initrd to boot the instance with. Xen PVM instances initrd to boot the instance with. Xen PVM instances
can use this always, while for KVM if this option is can use this always, while for KVM if this option is
only used if the <option>kernel_path</option> option only used if the <option>kernel_path</option> option
is also specified. is also specified. You can pass here either an
absolute filename (the path to the initrd) if you
want to use an initrd, or use the format
<userinput>no_initrd_path</userinput> for no initrd.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
...@@ -1127,7 +1130,7 @@ instance5: 11225 ...@@ -1127,7 +1130,7 @@ instance5: 11225
<para> <para>
Show detailed information about the given instance(s). This is Show detailed information about the given instance(s). This is
different from <command>list</command> as it shows detailed data different from <command>list</command> as it shows detailed data
about the instance's disks (especially useful for the drbd disk about the instance's disks (especially useful for the drbd disk
template). template).
</para> </para>
......
...@@ -170,7 +170,7 @@ def TestInstanceModify(instance): ...@@ -170,7 +170,7 @@ def TestInstanceModify(instance):
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)], ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)],
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)], ["-H", "%s=%s" % (constants.HV_KERNEL_PATH, constants.VALUE_DEFAULT)],
["-H", "%s=%s" % (constants.HV_INITRD_PATH, test_initrd)], ["-H", "%s=%s" % (constants.HV_INITRD_PATH, test_initrd)],
["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_NONE)], ["-H", "no_%s" % (constants.HV_INITRD_PATH, )],
["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)], ["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)],
# TODO: bridge tests # TODO: bridge tests
......
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