summaryrefslogtreecommitdiff
path: root/ceilometer/image
diff options
context:
space:
mode:
authorgord chung <gord@live.ca>2017-10-05 16:28:55 +0000
committergord chung <gord@live.ca>2017-11-16 14:43:46 -0500
commit50415c0d08a3199d2280f3638dd121779585f0fe (patch)
tree9e0440b015d697b19a846effee09ba62b4d1ac26 /ceilometer/image
parent124297b28332c5f047aa71ae362c2071d293d582 (diff)
downloadceilometer-50415c0d08a3199d2280f3638dd121779585f0fe.tar.gz
separate base manager from pipeline
common agent for all Change-Id: I19a83d3d0e5c91ab5cb6e792ab7389e36f8ede55
Diffstat (limited to 'ceilometer/image')
-rw-r--r--ceilometer/image/discovery.py2
-rw-r--r--ceilometer/image/glance.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ceilometer/image/discovery.py b/ceilometer/image/discovery.py
index 5dcf4757..a8d0a302 100644
--- a/ceilometer/image/discovery.py
+++ b/ceilometer/image/discovery.py
@@ -14,8 +14,8 @@
import glanceclient
from oslo_config import cfg
-from ceilometer.agent import plugin_base
from ceilometer import keystone_client
+from ceilometer.polling import plugin_base
SERVICE_OPTS = [
cfg.StrOpt('glance',
diff --git a/ceilometer/image/glance.py b/ceilometer/image/glance.py
index f36e7891..8b58c6b3 100644
--- a/ceilometer/image/glance.py
+++ b/ceilometer/image/glance.py
@@ -17,7 +17,7 @@
from __future__ import absolute_import
-from ceilometer.agent import plugin_base
+from ceilometer.polling import plugin_base
from ceilometer import sample