In Ganeti 1.2, “none” was used to signify no initrd. In 2.0 we have lost this,
and as a quick fix we document in the manpage how to disable the initrd via an
empty parameter.
The QA suite is changed accordingly.
---
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 176f70c..e7e66d3 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 an empty string
+ (<userinput>''</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 fe5dfb5..02551b1 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", "%s=''" % (constants.HV_INITRD_PATH, )],
["-H", "%s=%s" % (constants.HV_INITRD_PATH, constants.VALUE_DEFAULT)],
# TODO: bridge tests
--
1.6.2.4
