Revision 47e0abee lib/backend.py

b/lib/backend.py
66 66
from ganeti import vcluster
67 67
from ganeti import ht
68 68
from ganeti.block.base import BlockDev
69
from ganeti.block.drbd_info import DRBD8Info
69
from ganeti.block.drbd import DRBD8
70 70
from ganeti import hooksmaster
71 71

  
72 72

  
......
833 833

  
834 834
  if constants.NV_DRBDVERSION in what and vm_capable:
835 835
    try:
836
      drbd_version = DRBD8Info.CreateFromFile().GetVersionString()
836
      drbd_version = DRBD8.GetProcInfo().GetVersionString()
837 837
    except errors.BlockDeviceError, err:
838 838
      logging.warning("Can't get DRBD version", exc_info=True)
839 839
      drbd_version = str(err)
......
841 841

  
842 842
  if constants.NV_DRBDLIST in what and vm_capable:
843 843
    try:
844
      used_minors = drbd.DRBD8Dev.GetUsedDevs()
844
      used_minors = drbd.DRBD8.GetUsedDevs()
845 845
    except errors.BlockDeviceError, err:
846 846
      logging.warning("Can't get used minors list", exc_info=True)
847 847
      used_minors = str(err)
......
850 850
  if constants.NV_DRBDHELPER in what and vm_capable:
851 851
    status = True
852 852
    try:
853
      payload = drbd.DRBD8Dev.GetUsermodeHelper()
853
      payload = drbd.DRBD8.GetUsermodeHelper()
854 854
    except errors.BlockDeviceError, err:
855 855
      logging.error("Can't get DRBD usermode helper: %s", str(err))
856 856
      status = False
......
3692 3692

  
3693 3693
  """
3694 3694
  try:
3695
    return drbd.DRBD8Dev.GetUsermodeHelper()
3695
    return drbd.DRBD8.GetUsermodeHelper()
3696 3696
  except errors.BlockDeviceError, err:
3697 3697
    _Fail(str(err))
3698 3698

  

Also available in: Unified diff