Remove disabled_compute_pollsters option

This is now deprecated with pipeline usage.

Blueprint: remove-disabled-pollsters-option

Change-Id: I94dc005dcfd42a2cda125b2f91479a75252396df
Signed-off-by: Julien Danjou <julien@danjou.info>

ceilometer/compute/__init__.py

@@ -1,28 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Copyright © 2013 New Dream Network, LLC
-#
-# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-from oslo.config import cfg
-
-OPTS = [
-    cfg.ListOpt('disabled_compute_pollsters',
-                default=[],
-                help='list of compute agent pollsters to disable',
-                ),
-]
-
-cfg.CONF.register_opts(OPTS)

ceilometer/compute/manager.py

@@ -17,10 +17,10 @@
 # under the License.
 
 from oslo.config import cfg
+from stevedore import extension
 
 from ceilometer import agent
 from ceilometer.compute.virt import inspector as virt_inspector
-from ceilometer import extension_manager
 from ceilometer import nova_client
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import service as os_service
@@ -57,9 +57,9 @@ class AgentManager(agent.AgentManager):
 
     def __init__(self):
         super(AgentManager, self).__init__(
-            extension_manager.ActivatedExtensionManager(
+            extension.ExtensionManager(
                 namespace='ceilometer.poll.compute',
-                disabled_names=cfg.CONF.disabled_compute_pollsters,
+                invoke_on_load=True,
             ),
         )
         self._inspector = virt_inspector.get_hypervisor_inspector()

ceilometer/compute/nova_notifier.py

@@ -32,9 +32,8 @@ for name in ['openstack', 'openstack.common', 'openstack.common.log']:
 
 from nova.conductor import api
 
-from oslo.config import cfg
+from stevedore import extension
 
-from ceilometer import extension_manager
 from ceilometer.compute.virt import inspector
 from ceilometer.openstack.common.gettextutils import _
 
@@ -84,9 +83,9 @@ def initialize_gatherer(gatherer=None):
         _gatherer = gatherer
     if _gatherer is None:
         LOG.debug(_('making a new stats gatherer'))
-        mgr = extension_manager.ActivatedExtensionManager(
+        mgr = extension.ExtensionManager(
             namespace='ceilometer.poll.compute',
-            disabled_names=cfg.CONF.disabled_compute_pollsters,
+            invoke_on_load=True,
         )
         _gatherer = DeletedInstanceStatsGatherer(mgr)
     return _gatherer

doc/source/configuration.rst

@@ -42,7 +42,6 @@ control_exchange                 ceilometer                            AMQP exch
 periodic_interval                600                                   seconds between running periodic tasks
 database_connection              mongodb://localhost:27017/ceilometer  Database connection string
 metering_api_port                8777                                  The port for the ceilometer API server
-disabled_compute_pollsters                                             List of compute pollsters to skip loading
 disabled_notification_listeners                                        List of notification listeners to skip loading
 reseller_prefix                  AUTH\_                                Prefix used by swift for reseller token
 ===============================  ====================================  ==============================================================

etc/ceilometer/ceilometer.conf.sample

@@ -39,14 +39,6 @@
 #enable_v1_api=true
 
 
-#
-# Options defined in ceilometer.compute
-#
-
-# list of compute agent pollsters to disable (list value)
-#disabled_compute_pollsters=
-
-
 #
 # Options defined in ceilometer.compute.notifications
 #
@@ -625,4 +617,4 @@
 #password=<None>
 
 
-# Total option count: 119
+# Total option count: 118