diff --git a/ceilometer/central/manager.py b/ceilometer/central/manager.py index d91d1b23d..d2ea27a9c 100644 --- a/ceilometer/central/manager.py +++ b/ceilometer/central/manager.py @@ -18,22 +18,14 @@ from keystoneclient.v2_0 import client as ksclient from oslo.config import cfg +from stevedore import extension from ceilometer import agent -from ceilometer import extension_manager from ceilometer.openstack.common import log from ceilometer.openstack.common import service as os_service from ceilometer.openstack.common.rpc import service as rpc_service from ceilometer import service -OPTS = [ - cfg.ListOpt('disabled_central_pollsters', - default=[], - help='list of central pollsters to disable', - ), -] - -cfg.CONF.register_opts(OPTS) cfg.CONF.import_group('service_credentials', 'ceilometer.service') LOG = log.getLogger(__name__) @@ -60,10 +52,10 @@ class AgentManager(agent.AgentManager): def __init__(self): super(AgentManager, self).__init__( - extension_manager.ActivatedExtensionManager( + extension.ExtensionManager( namespace='ceilometer.poll.central', - disabled_names=cfg.CONF.disabled_central_pollsters, - ), + invoke_on_load=True, + ) ) def create_polling_task(self): diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 2273c599f..535b82faa 100644 --- a/doc/source/configuration.rst +++ b/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_central_pollsters List of central pollsters to skip loading 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 diff --git a/etc/ceilometer/ceilometer.conf.sample b/etc/ceilometer/ceilometer.conf.sample index db8d834fb..52b25be83 100644 --- a/etc/ceilometer/ceilometer.conf.sample +++ b/etc/ceilometer/ceilometer.conf.sample @@ -39,14 +39,6 @@ #enable_v1_api=true -# -# Options defined in ceilometer.central.manager -# - -# list of central pollsters to disable (list value) -#disabled_central_pollsters= - - # # Options defined in ceilometer.compute # @@ -633,4 +625,4 @@ #password= -# Total option count: 120 +# Total option count: 119