Merge branch 'stable-2.9' into stable-2.10

* stable-2.9
  Start NEWS entry for 2.9.0 rc4

* stable-2.8
  Version bump for 2.8.1
  Verify that ConfD is running after master-failover
  daemon-util: handle luxid in {start,stop}_master()
  Fix typo in storage.FileStorage docstring
  Fix path for serial file

Conflicts:
	NEWS: take both additions
Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

NEWS

@@ -62,10 +62,10 @@ Python
   version 1.0.1. It is still used for testing only.
 
 
-Version 2.9.0 rc3
+Version 2.9.0 rc4
 -----------------
 
-*(Released Tue, 15 Oct 2013)*
+*(unreleased)*
 
 Incompatible/important changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -131,9 +131,20 @@ Haskell
 - ``hslogger`` (http://software.complete.org/hslogger) is now always
   required, even if confd is not enabled.
 
-Since 2.9.0 rc2
+Since 2.9.0 rc3
 ~~~~~~~~~~~~~~~
 
+- Correctly start/stop luxid during gnt-cluster master-failover (inherited
+  from stable-2.8)
+
+
+Version 2.9.0 rc3
+-----------------
+
+*(Released Tue, 15 Oct 2013)*
+
+The third release candidate in the 2.9 series. Since 2.9.0 rc2:
+
 - in implicit configuration upgrade, match ipolicy with enabled disk templates
 - improved harep documentation (inherited from stable-2.8)
 
@@ -173,6 +184,18 @@ This was the first beta release of the 2.9 series. All important changes
 are listed in the latest 2.9 entry.
 
 
+Version 2.8.1
+-------------
+
+*(Released Thu, 17 Oct 2013)*
+
+- Correctly start/stop luxid during gnt-cluster master-failover
+- Don't attempt IPv6 ssh in case of IPv4 cluster (Issue 595)
+- Fix path for the job queue serial file
+- Improved harep man page
+- Minor documentation improvements
+
+
 Version 2.8.0
 -------------
 

daemons/daemon-util.in

@@ -292,12 +292,14 @@ check_and_start() {
 start_master() {
   start ganeti-masterd
   start ganeti-rapi
+  _confd_enabled && start ganeti-luxid
 }
 
 # Stops the master role
 stop_master() {
   stop ganeti-rapi
   stop ganeti-masterd
+  _confd_enabled && stop ganeti-luxid
 }
 
 # Start all daemons

lib/storage/bdev.py

@@ -715,7 +715,7 @@ class LogicalVolume(base.BlockDev):
 class FileStorage(base.BlockDev):
   """File device.
 
-  This class represents the a file storage backend device.
+  This class represents a file storage backend device.
 
   The unique_id for the file device is a (file_driver, file_path) tuple.
 

qa/qa_cluster.py

@@ -1125,10 +1125,13 @@ def TestClusterMasterFailover():
   failovermaster = qa_config.AcquireNode(exclude=master)
 
   cmd = ["gnt-cluster", "master-failover"]
+  node_list_cmd = ["gnt-node", "list"]
   try:
     AssertCommand(cmd, node=failovermaster)
+    AssertCommand(node_list_cmd, node=failovermaster)
     # Back to original master node
     AssertCommand(cmd, node=master)
+    AssertCommand(node_list_cmd, node=master)
   finally:
     failovermaster.Release()
 

src/Ganeti/Path.hs

@@ -108,7 +108,7 @@ queueDir = dataDirP "queue"
 
 -- | Job queue serial file.
 jobQueueSerialFile :: IO FilePath
-jobQueueSerialFile = dataDirP "serial"
+jobQueueSerialFile = queueDir `pjoin` "serial"
 
 -- | Job queue archive directory.
 jobQueueArchiveSubDir :: FilePath