Merge branch 'devel-2.5'

* devel-2.5:
  Allow per-hypervisor optional files
  Add hypervisors ancillary files list
  xen: abstract a few hardcoded strings as constants

Conflicts:
	lib/cmdlib.py
	  - trivial

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>

diff --cc lib/backend.py
Simple merge

diff --cc lib/cmdlib.py
index 8ec6f4a,daec49d..23ee2e9
--- 1/lib/cmdlib.py
--- 2/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@@ -2155,10 -2169,10 +2150,10 @@@ class LUClusterVerifyGroup(LogicalUnit
        # Nodes missing file
        missing_file = expected_nodes - with_file
  
-       if filename in files_all_opt:
+       if filename in files_opt:
          # All or no nodes
          errorif(missing_file and missing_file != expected_nodes,
 -                cls.ECLUSTERFILECHECK, None,
 +                constants.CV_ECLUSTERFILECHECK, None,
                  "File %s is optional, but it must exist on all or no"
                  " nodes (not found on %s)",
                  filename, utils.CommaJoin(utils.NiceSort(missing_file)))
@@@ -3758,8 -3730,7 +3753,9 @@@ def _ComputeAncillaryFiles(cluster, red
      constants.SSH_KNOWN_HOSTS_FILE,
      constants.CONFD_HMAC_KEY,
      constants.CLUSTER_DOMAIN_SECRET_FILE,
 +    constants.SPICE_CERT_FILE,
 +    constants.SPICE_CACERT_FILE,
+     constants.RAPI_USERS_FILE,
      ])
  
    if not redist:

diff --cc lib/hypervisor/hv_base.py
Simple merge

diff --cc lib/hypervisor/hv_kvm.py
Simple merge

diff --cc lib/hypervisor/hv_xen.py
Simple merge

diff --cc test/ganeti.cmdlib_unittest.py
Simple merge