Add "adopt" to the allowed disk parameters
authorApollon Oikonomopoulos <apollon@noc.grnet.gr>
Fri, 18 Jun 2010 14:52:05 +0000 (17:52 +0300)
committerIustin Pop <iustin@google.com>
Mon, 21 Jun 2010 13:10:04 +0000 (15:10 +0200)
"adopt" was missing from bd061c3, thus breaking disk adoption.

Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

lib/constants.py

index c0b90cf..f2e978f 100644 (file)
@@ -587,8 +587,13 @@ NICS_PARAMETERS = frozenset(NICS_PARAMETER_TYPES.keys())
 
 IDISK_SIZE = "size"
 IDISK_MODE = "mode"
-IDISK_PARAMS = frozenset([IDISK_SIZE, IDISK_MODE])
-IDISK_PARAMS_TYPES = {IDISK_SIZE: VTYPE_SIZE, IDISK_MODE: VTYPE_STRING}
+IDISK_ADOPT = "adopt"
+IDISK_PARAMS = frozenset([IDISK_SIZE, IDISK_MODE, IDISK_ADOPT])
+IDISK_PARAMS_TYPES = {
+  IDISK_SIZE: VTYPE_SIZE,
+  IDISK_MODE: VTYPE_STRING,
+  IDISK_ADOPT: VTYPE_STRING,
+  }
 INIC_MAC = "mac"
 INIC_IP = "ip"
 INIC_MODE = "mode"