commit c18a9dbaad078386592eb83f79cf09bde13a46af
Merge: 87e5a7c 0e83bab
Author: Petr Pudlak <[email protected]>
Date: Mon Oct 6 16:41:32 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
ganeti.daemon: fix daemon mode with GnuTLS >= 3.3
Fix DRBD version check for non VM capable nodes
Fix invalid message from gnt-os
Renaming NV_VMNODES to NV_NONVMNODES
Node names in NV_VMNODES
* stable-2.9
Ganeti.Daemon: always install SIGHUP handler
Signed-off-by: Petr Pudlak <[email protected]>
diff --cc lib/cmdlib/cluster.py
index e567dcf,d1d38c7..337e866
--- a/lib/cmdlib/cluster.py
+++ b/lib/cmdlib/cluster.py
@@@ -3115,9 -2961,8 +3116,9 @@@ class LUClusterVerifyGroup(LogicalUnit
constants.NV_TIME: None,
constants.NV_MASTERIP: (self.cfg.GetMasterNodeName(), master_ip),
constants.NV_OSLIST: None,
- constants.NV_VMNODES: self.cfg.GetNonVmCapableNodeList(),
+ constants.NV_NONVMNODES: self.cfg.GetNonVmCapableNodeNameList(),
constants.NV_USERSCRIPTS: user_scripts,
+ constants.NV_CLIENT_CERT: None,
}
if vg_name is not None:
