diff --git a/lib/opcodes.py b/lib/opcodes.py
index 85ec44526f3e89c6e2664dad2fd9c25c5efe6a8b..5362895e71e5f846cc35a92f7e39ddd89fc2a8c4 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -78,6 +78,9 @@ _PTagKind = ("kind", ht.NoDefault, ht.TElemOf(constants.VALID_TAG_TYPES))
 #: List of tag strings
 _PTags = ("tags", ht.NoDefault, ht.TListOf(ht.TNonEmptyString))
 
+#: Ignore consistency
+_PIgnoreConsistency = ("ignore_consistency", False, ht.TBool)
+
 #: OP_ID conversion regular expression
 _OPID_RE = re.compile("([a-z])([A-Z])")
 
@@ -696,8 +699,8 @@ class OpRepairNodeStorage(OpCode):
   OP_PARAMS = [
     _PNodeName,
     _PStorageType,
+    _PIgnoreConsistency,
     ("name", ht.NoDefault, ht.TNonEmptyString),
-    ("ignore_consistency", False, ht.TBool),
     ]
 
 
@@ -879,7 +882,7 @@ class OpInstanceFailover(OpCode):
   OP_PARAMS = [
     _PInstanceName,
     _PShutdownTimeout,
-    ("ignore_consistency", False, ht.TBool),
+    _PIgnoreConsistency,
     ]