Revision 0c2cfb97

b/qa/qa_cluster.py
455 455
      (default_disk_template, default_disk_template)],
456 456
    fail=False)
457 457

  
458
  # interaction with --drbd-usermode-helper option
459
  drbd_usermode_helper = qa_config.get("drbd-usermode-helper", None)
460
  if not drbd_usermode_helper:
461
    drbd_usermode_helper = "/bin/true"
462
  # specifying a helper when drbd gets disabled
463
  AssertCommand(["gnt-cluster", "modify",
464
                 "--drbd-usermode-helper=%s" % drbd_usermode_helper,
465
                 "--enabled-disk-templates=%s" % constants.DT_DISKLESS],
466
                 fail=False)
467 458
  if constants.DT_DRBD8 in enabled_disk_templates:
468
    # specifying a vg name when lvm is enabled
459
    # interaction with --drbd-usermode-helper option
460
    drbd_usermode_helper = qa_config.get("drbd-usermode-helper", None)
461
    if not drbd_usermode_helper:
462
      drbd_usermode_helper = "/bin/true"
463
    # specifying a helper when drbd gets disabled is ok. Note that drbd still
464
    # has to be installed on the nodes in this case
465
    AssertCommand(["gnt-cluster", "modify",
466
                   "--drbd-usermode-helper=%s" % drbd_usermode_helper,
467
                   "--enabled-disk-templates=%s" % constants.DT_DISKLESS],
468
                   fail=False)
469
    # specifying a helper when drbd is re-enabled
469 470
    AssertCommand(["gnt-cluster", "modify",
470 471
                   "--drbd-usermode-helper=%s" % drbd_usermode_helper,
471 472
                   "--enabled-disk-templates=%s" %

Also available in: Unified diff