Merge branch 'stable-2.4'

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

NEWS

@@ -37,10 +37,37 @@ Incompatible/important changes:
 Version 2.4.3
 -------------
 
-*(unreleased)*
-
+*(Released Fri, 5 Aug 2011)*
+
+Many bug-fixes and a few small features:
+
+- Fixed argument order in ``ReserveLV`` and ``ReserveMAC`` which caused
+  issues when you tried to add an instance with two MAC addresses in one
+  request
+- KVM: fixed per-instance stored UID value
+- KVM: configure bridged NICs at migration start
+- KVM: Fix a bug where instance will not start with never KVM versions
+  (>= 0.14)
+- Added OS search path to ``gnt-cluster info``
+- Fixed an issue with ``file_storage_dir`` where you were forced to
+  provide an absolute path, but the documentation states it is a
+  relative path, the documentation was right
 - Added a new parameter to instance stop/start called ``--no-remember``
   that will make the state change to not be remembered
+- Implemented ``no_remember`` at RAPI level
+- Improved the documentation
+- Node evacuation: don't call IAllocator if node is already empty
+- Fixed bug in DRBD8 replace disks on current nodes
+- Fixed bug in recreate-disks for DRBD instances
+- Moved assertion checking locks in ``gnt-instance replace-disks``
+  causing it to abort with not owning the right locks for some situation
+- Job queue: Fixed potential race condition when cancelling queued jobs
+- Fixed off-by-one bug in job serial generation
+- ``gnt-node volumes``: Fix instance names
+- Fixed aliases in bash completion
+- Fixed a bug in reopening log files after beeing sent a SIGHUP
+- Added a flag to burnin to allow specifying VCPU count
+- Bugfixes to non-root Ganeti configuration
 
 
 Version 2.4.2
@@ -127,7 +154,7 @@ Version 2.4.1
 *(Released Wed, 09 Mar 2011)*
 
 Emergency bug-fix release. ``tools/cfgupgrade`` was broken and overwrote
-the RAPI users file if run twice (even with ``-dry-run``).
+the RAPI users file if run twice (even with ``--dry-run``).
 
 The release fixes that bug (nothing else changed).
 

configure.ac

 # Configure script for Ganeti
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [4])
-m4_define([gnt_version_revision], [2])
+m4_define([gnt_version_revision], [3])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],

lib/utils/algo.py

@@ -119,7 +119,7 @@ def InvertDict(dict_in):
   """Inverts the key/value mapping of a dict.
 
   @param dict_in: The dict to invert
-  @returns the inverted dict
+  @return: the inverted dict
 
   """
   return dict(zip(dict_in.values(), dict_in.keys()))

tools/burnin

@@ -126,6 +126,9 @@ OPTIONS = [
                  default=128, type="unit", metavar="<size>",
                  completion_suggest=("128M 256M 512M 1G 4G 8G"
                                      " 12G 16G").split()),
+  cli.cli_option("--vcpu-count", dest="vcpu_count", help="VCPU count",
+                 default=3, type="unit", metavar="<count>",
+                 completion_suggest=("1 2 3 4").split()),
   cli.DEBUG_OPT,
   cli.VERBOSE_OPT,
   cli.NOIPCHECK_OPT,
@@ -473,7 +476,7 @@ class Burner(object):
     self.instances = args
     self.bep = {
       constants.BE_MEMORY: options.mem_size,
-      constants.BE_VCPUS: 1,
+      constants.BE_VCPUS: options.vcpu_count,
       }
 
     self.hypervisor = None