diff --git a/hooks/hooks.py b/hooks/hooks.py index 3d81941c..845714d7 100755 --- a/hooks/hooks.py +++ b/hooks/hooks.py @@ -23,7 +23,7 @@ import uuid sys.path.append('lib') import ceph_rgw as ceph -import ceph.utils as ceph_utils +import charms_ceph.utils as ceph_utils import multisite from charmhelpers.core.hookenv import ( diff --git a/lib/ceph/__init__.py b/lib/charms_ceph/__init__.py similarity index 100% rename from lib/ceph/__init__.py rename to lib/charms_ceph/__init__.py diff --git a/lib/ceph/broker.py b/lib/charms_ceph/broker.py similarity index 99% rename from lib/ceph/broker.py rename to lib/charms_ceph/broker.py index bae74a12..ceda9a85 100644 --- a/lib/ceph/broker.py +++ b/lib/charms_ceph/broker.py @@ -18,11 +18,11 @@ import os from tempfile import NamedTemporaryFile -from ceph.utils import ( +from charms_ceph.utils import ( get_cephfs, get_osd_weight ) -from ceph.crush_utils import Crushmap +from charms_ceph.crush_utils import Crushmap from charmhelpers.core.hookenv import ( log, diff --git a/lib/ceph/crush_utils.py b/lib/charms_ceph/crush_utils.py similarity index 100% rename from lib/ceph/crush_utils.py rename to lib/charms_ceph/crush_utils.py diff --git a/lib/ceph/utils.py b/lib/charms_ceph/utils.py similarity index 100% rename from lib/ceph/utils.py rename to lib/charms_ceph/utils.py