LUClusterVerify: Ignore /proc/drbd if DRBD is disabled
authorMichael Hanselmann <hansmi@google.com>
Tue, 2 Oct 2012 18:41:19 +0000 (20:41 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 3 Oct 2012 00:06:11 +0000 (02:06 +0200)
This fixes issue 190. The problem was that the check for DRBD was
enabled if LVM storage is used and didn't depend at all on whether DRBD
is enabled.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
Signed-off-by: Michael Hanselmann <hansmi@google.com>

lib/cmdlib.py

index bb41146..fd73ae9 100644 (file)
@@ -3100,9 +3100,9 @@ class LUClusterVerifyGroup(LogicalUnit, _VerifyErrors):
       node_verify_param[constants.NV_VGLIST] = None
       node_verify_param[constants.NV_LVLIST] = vg_name
       node_verify_param[constants.NV_PVLIST] = [vg_name]
-      node_verify_param[constants.NV_DRBDLIST] = None
 
     if drbd_helper:
+      node_verify_param[constants.NV_DRBDLIST] = None
       node_verify_param[constants.NV_DRBDHELPER] = drbd_helper
 
     # bridge checks