ceph-volume devices.lvm refactor importing api to come from api/lvm.py

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f4bee6cb42a017abce269ed3926deff04038a47e)

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
index 5a755672a95dc243e9d7522586c3da00cb13b1e1..b292b89af865f50a8000667b4734ecdcd3362841 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
@@ -4,7 +4,7 @@ from textwrap import dedent
 from ceph_volume import process, conf, decorators
 from ceph_volume.util import system, disk
 from ceph_volume.systemd import systemctl
-from . import api
+from ceph_volume.api import lvm as api
 
 
 def activate_filestore(lvs):

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/listing.py b/src/ceph-volume/ceph_volume/devices/lvm/listing.py
index 4f2805e715eb5118d6d837fc66729304c560f33e..a063770cacaee1814ed90700b6ffb9f386d64df3 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/listing.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/listing.py
@@ -5,7 +5,7 @@ import logging
 from textwrap import dedent
 from ceph_volume import decorators
 from ceph_volume.util import disk
-from . import api
+from ceph_volume.api import lvm as api
 
 logger = logging.getLogger(__name__)
 

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
index 1ca5b0d88540f86546a49deff5d68de02676df05..81bb6efd59a01d335534deedae634af48b8a8938 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
@@ -5,7 +5,7 @@ from textwrap import dedent
 from ceph_volume.util import prepare as prepare_utils
 from ceph_volume.util import system, disk
 from ceph_volume import conf, decorators, terminal
-from . import api
+from ceph_volume.api import lvm as api
 from .common import prepare_parser