summaryrefslogtreecommitdiff
path: root/ceilometer/opts.py
diff options
context:
space:
mode:
authorgord chung <gord@live.ca>2017-02-10 16:20:49 -0500
committergordon chung <gord@live.ca>2017-02-13 17:15:07 +0000
commit47ae182b4dbada1beb4e1b9017fad102d9549aec (patch)
tree123b39651018ccc09f4db1bed4d7acc5bf92abff /ceilometer/opts.py
parent09aa7ef3c9c862b2a55ad7600e7df98b50639c83 (diff)
downloadceilometer-47ae182b4dbada1beb4e1b9017fad102d9549aec.tar.gz
drop kwapi pollster
we deprecated this in newton and it's been dead for far longer. Change-Id: I790e36c7daefb07eefe68298f91c14211f9a8df0
Diffstat (limited to 'ceilometer/opts.py')
-rw-r--r--ceilometer/opts.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/ceilometer/opts.py b/ceilometer/opts.py
index 824bad5f..bd878ad7 100644
--- a/ceilometer/opts.py
+++ b/ceilometer/opts.py
@@ -31,7 +31,6 @@ import ceilometer.dispatcher
import ceilometer.dispatcher.file
import ceilometer.dispatcher.gnocchi_opts
import ceilometer.dispatcher.http
-import ceilometer.energy.kwapi
import ceilometer.event.converter
import ceilometer.exchange_control
import ceilometer.hardware.discovery
@@ -114,8 +113,7 @@ def list_opts():
('publisher_notifier', ceilometer.publisher.messaging.NOTIFIER_OPTS),
('rgw_admin_credentials', ceilometer.objectstore.rgw.CREDENTIAL_OPTS),
('service_types',
- itertools.chain(ceilometer.energy.kwapi.SERVICE_OPTS,
- ceilometer.image.discovery.SERVICE_OPTS,
+ itertools.chain(ceilometer.image.discovery.SERVICE_OPTS,
ceilometer.neutron_client.SERVICE_OPTS,
ceilometer.nova_client.SERVICE_OPTS,
ceilometer.objectstore.rgw.SERVICE_OPTS,