From b999330ab5f969e26386191539afadf794a07c44 Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Tue, 26 Feb 2019 11:40:06 +0100 Subject: [PATCH] Move to ``charms.openstack.plugins`` class references --- src/lib/charm/openstack/ceph_rbd_mirror.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/charm/openstack/ceph_rbd_mirror.py b/src/lib/charm/openstack/ceph_rbd_mirror.py index 80f16e2..689f2d3 100644 --- a/src/lib/charm/openstack/ceph_rbd_mirror.py +++ b/src/lib/charm/openstack/ceph_rbd_mirror.py @@ -17,6 +17,7 @@ import subprocess import charms_openstack.charm import charms_openstack.adapters +import charms_openstack.plugins # import charmhelpers.core.host as ch_host @@ -24,12 +25,12 @@ import charms_openstack.adapters class CephRBDMirrorCharmRelationAdapters( charms_openstack.adapters.OpenStackRelationAdapters): relation_adapters = { - 'ceph_local': charms_openstack.adapters.CephRelationAdapter, - 'ceph_remote': charms_openstack.adapters.CephRelationAdapter, + 'ceph_local': charms_openstack.plugins.CephRelationAdapter, + 'ceph_remote': charms_openstack.plugins.CephRelationAdapter, } -class CephRBDMirrorCharm(charms_openstack.charm.CephCharm): +class CephRBDMirrorCharm(charms_openstack.plugins.CephCharm): # We require Ceph 12.2 Luminous or later for HA support in the Ceph # rbd-mirror daemon. Luminous appears in UCA at pike. release = 'pike'