Renaming NV_VMNODES to NV_NONVMNODES

This patch renames the constant 'NV_VMNODES' to
'NV_NONVMNODES' as it is actually used to store
a list of *non* vm-capable nodes.
Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

lib/backend.py

@@ -974,7 +974,7 @@ def VerifyNode(what, cluster_name, all_hvparams):
   result = {}
   my_name = netutils.Hostname.GetSysName()
   port = netutils.GetDaemonPort(constants.NODED)
-  vm_capable = my_name not in what.get(constants.NV_VMNODES, [])
+  vm_capable = my_name not in what.get(constants.NV_NONVMNODES, [])
 
   _VerifyHypervisors(what, vm_capable, result, all_hvparams)
   _VerifyHvparams(what, vm_capable, result)

lib/cmdlib/cluster.py

@@ -2960,7 +2960,7 @@ class LUClusterVerifyGroup(LogicalUnit, _VerifyErrors):
       constants.NV_TIME: None,
       constants.NV_MASTERIP: (self.cfg.GetMasterNodeName(), master_ip),
       constants.NV_OSLIST: None,
-      constants.NV_VMNODES: self.cfg.GetNonVmCapableNodeNameList(),
+      constants.NV_NONVMNODES: self.cfg.GetNonVmCapableNodeNameList(),
       constants.NV_USERSCRIPTS: user_scripts,
       }
 

src/Ganeti/Constants.hs

@@ -3029,8 +3029,8 @@ nvVersion = "version"
 nvVglist :: String
 nvVglist = "vglist"
 
-nvVmnodes :: String
-nvVmnodes = "vmnodes"
+nvNonvmnodes :: String
+nvNonvmnodes = "nonvmnodes"
 
 -- * Instance status