Force conflicts check in LUNetworkDisconnect

[ganeti-local] / lib / cmdlib.py

diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index cf5bd15..6e2b8a8 100644 (file)
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -16790,9 +16790,8 @@ class LUNetworkDisconnect(LogicalUnit):
 
       # Lock instances optimistically, needs verification once group lock has
       # been acquired
-      if self.op.conflicts_check:
-        self.needed_locks[locking.LEVEL_INSTANCE] = \
-          self.cfg.GetNodeGroupInstances(self.group_uuid)
+      self.needed_locks[locking.LEVEL_INSTANCE] = \
+        self.cfg.GetNodeGroupInstances(self.group_uuid)
 
   def BuildHooksEnv(self):
     ret = {
@@ -16817,9 +16816,8 @@ class LUNetworkDisconnect(LogicalUnit):
       self.connected = False
       return
 
-    if self.op.conflicts_check:
-      _NetworkConflictCheck(self, lambda nic: nic.network == self.network_name,
-                            "disconnect from")
+    _NetworkConflictCheck(self, lambda nic: nic.network == self.network_name,
+                          "disconnect from")
 
   def Exec(self, feedback_fn):
     if not self.connected: