nova.conf.sample out of sync

[Yongli He]

$ tools/config/generate_sample.sh -b . -p nova -o etc/nova
$ git diff
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 3e9bef8..47e98c9 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -1962,6 +1962,16 @@
 # Whether to use cow images (boolean value)
 #use_cow_images=true

+# Fail instance boot if vif plugging fails (boolean value)
+#vif_plugging_is_fatal=true
+
+# Number of seconds to wait for neutron vif plugging events to
+# arrive before continuing or failing (see
+# vif_plugging_is_fatal). If this is set to zero and
+# vif_plugging_is_fatal is False, events should not be
+# expected to arrive at all. (integer value)
+#vif_plugging_timeout=300
+

 #
 # Options defined in nova.virt.firewall
@@ -1999,6 +2009,17 @@

 #
+# Options defined in nova.virt.imagehandler
+#
+
+# Specifies which image handler extension names to use for
+# handling images. The first extension in the list which can
+# handle the image with a suitable location will be used.
+# (list value)
+#image_handlers=download
+
+
+#
 # Options defined in nova.virt.images

[Dan Smith (danms)]

This was a conscious decision made recently. I think the sample is intended to come out as well. I would expect that generating the current sample is a packaging step.

[Tracy Jones (tjones-i)]

i'm removing this from rc1 based on that and opening a new bug on removing it, adding a README, or adding it to the packaging step.

[Tracy Jones (tjones-i)]

and marking invalid as well as there is no intent to keeping it up to date automatically