Merge branch 'devel-2.5'

[ganeti-local] / lib / objects.py

diff --git a/lib/objects.py b/lib/objects.py
index 69862b6..8cc7ac3 100644 (file)
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -401,7 +401,8 @@ class NIC(ConfigObject):
     @raise errors.ConfigurationError: when a parameter is not valid
 
     """
-    if nicparams[constants.NIC_MODE] not in constants.NIC_VALID_MODES:
+    if (nicparams[constants.NIC_MODE] not in constants.NIC_VALID_MODES and
+        nicparams[constants.NIC_MODE] != constants.VALUE_AUTO):
       err = "Invalid nic mode: %s" % nicparams[constants.NIC_MODE]
       raise errors.ConfigurationError(err)