[PATCH stable-2.10 2/2] Renaming NV_VMNODES to NV_NONVMNODES

['Helga Velroyen' via ganeti-devel]

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 <hel...@google.com>
---
 lib/backend.py          | 2 +-
 lib/cmdlib/cluster.py   | 2 +-
 src/Ganeti/Constants.hs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/backend.py b/lib/backend.py
index e638e1c..051f774 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -965,7 +965,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)
diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py
index ae43587..d945062 100644
--- a/lib/cmdlib/cluster.py
+++ b/lib/cmdlib/cluster.py
@@ -2951,7 +2951,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.GetNonVmCapableNodeList(),
+      constants.NV_NONVMNODES: self.cfg.GetNonVmCapableNodeList(),
       constants.NV_USERSCRIPTS: user_scripts,
       }
 
diff --git a/src/Ganeti/Constants.hs b/src/Ganeti/Constants.hs
index 23e1a2f..756b90e 100644
--- a/src/Ganeti/Constants.hs
+++ b/src/Ganeti/Constants.hs
@@ -3020,8 +3020,8 @@ nvVersion = "version"
 nvVglist :: String
 nvVglist = "vglist"
 
-nvVmnodes :: String
-nvVmnodes = "vmnodes"
+nvNonvmnodes :: String
+nvNonvmnodes = "nonvmnodes"
 
 -- * Instance status
 
-- 
2.0.0.526.g5318336