Revision 89ff748d lib/backend.py
b/lib/backend.py | ||
---|---|---|
55 | 55 |
from ganeti import hypervisor |
56 | 56 |
from ganeti import constants |
57 | 57 |
from ganeti.block import bdev |
58 |
from ganeti.block import drbd |
|
58 | 59 |
from ganeti import objects |
59 | 60 |
from ganeti import ssconf |
60 | 61 |
from ganeti import serializer |
... | ... | |
65 | 66 |
from ganeti import pathutils |
66 | 67 |
from ganeti import vcluster |
67 | 68 |
from ganeti import ht |
69 |
from ganeti.block.base import BlockDev |
|
68 | 70 |
|
69 | 71 |
|
70 | 72 |
_BOOT_ID_PATH = "/proc/sys/kernel/random/boot_id" |
... | ... | |
830 | 832 |
|
831 | 833 |
if constants.NV_DRBDLIST in what and vm_capable: |
832 | 834 |
try: |
833 |
used_minors = bdev.DRBD8.GetUsedDevs().keys()
|
|
835 |
used_minors = drbd.DRBD8.GetUsedDevs().keys()
|
|
834 | 836 |
except errors.BlockDeviceError, err: |
835 | 837 |
logging.warning("Can't get used minors list", exc_info=True) |
836 | 838 |
used_minors = str(err) |
... | ... | |
839 | 841 |
if constants.NV_DRBDHELPER in what and vm_capable: |
840 | 842 |
status = True |
841 | 843 |
try: |
842 |
payload = bdev.BaseDRBD.GetUsermodeHelper()
|
|
844 |
payload = drbd.BaseDRBD.GetUsermodeHelper()
|
|
843 | 845 |
except errors.BlockDeviceError, err: |
844 | 846 |
logging.error("Can't get DRBD usermode helper: %s", str(err)) |
845 | 847 |
status = False |
... | ... | |
1872 | 1874 |
""" |
1873 | 1875 |
try: |
1874 | 1876 |
result = _RecursiveAssembleBD(disk, owner, as_primary) |
1875 |
if isinstance(result, bdev.BlockDev):
|
|
1877 |
if isinstance(result, BlockDev): |
|
1876 | 1878 |
# pylint: disable=E1103 |
1877 | 1879 |
result = result.dev_path |
1878 | 1880 |
if as_primary: |
... | ... | |
3669 | 3671 |
|
3670 | 3672 |
""" |
3671 | 3673 |
try: |
3672 |
return bdev.BaseDRBD.GetUsermodeHelper()
|
|
3674 |
return drbd.BaseDRBD.GetUsermodeHelper()
|
|
3673 | 3675 |
except errors.BlockDeviceError, err: |
3674 | 3676 |
_Fail(str(err)) |
3675 | 3677 |
|
Also available in: Unified diff