From 5645d16b69267ec39dfc27ebbe6d8efa63a9a856 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Mon, 11 May 2009 15:43:34 +0200
Subject: [PATCH] Fix QA and documentation about no initrd case
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
man/gnt-instance.sgml | 7 +++++--
qa/qa_instance.py | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index 176f70c0d..b43f0da40 100644
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -460,7 +460,10 @@
initrd to boot the instance with. Xen PVM instances
can use this always, while for KVM if this option is
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>
</listitem>
</varlistentry>
@@ -1127,7 +1130,7 @@ instance5: 11225
<para>
Show detailed information about the given instance(s). This is
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).
</para>
diff --git a/qa/qa_instance.py b/qa/qa_instance.py
index fe5dfb58d..af3afeb6a 100644
--- a/qa/qa_instance.py
+++ b/qa/qa_instance.py
@@ -170,7 +170,7 @@ def TestInstanceModify(instance):
["-H", "%s=%s" % (constants.HV_KERNEL_PATH, test_kernel)],
["-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, constants.VALUE_NONE)],
+ ["-H", "no_%s" % (constants.HV_INITRD_PATH, )],
["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)],
# TODO: bridge tests
--
GitLab