Merge branch 'stable-2.8' into stable-2.9

[ganeti-local] / lib / opcodes.py

diff --git a/lib/opcodes.py b/lib/opcodes.py
index a2c6fa7..ccdb9aa 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -626,7 +626,7 @@ class OpCode(BaseOpCode):
      " for details"),
     (COMMENT_ATTR, None, ht.TMaybeString,
      "Comment describing the purpose of the opcode"),
-    (constants.OPCODE_REASON, None, ht.TMaybeList,
+    (constants.OPCODE_REASON, ht.EmptyList, ht.TMaybeList,
      "The reason trail, describing why the OpCode is executed"),
     ]
   OP_RESULT = None
@@ -1518,6 +1518,8 @@ class OpInstanceFailover(OpCode):
     _PIgnoreIpolicy,
     _PIAllocFromDesc("Iallocator for deciding the target node for"
                      " shared-storage instances"),
+    ("cleanup", False, ht.TBool,
+     "Whether a previously failed failover should be cleaned up"),
     ]
   OP_RESULT = ht.TNone