openstack/aodh
Code Issues Proposed changes

Remove disabled_central_pollsters option

Browse Source 
This is now deprecated with pipeline usage.

Blueprint: remove-disabled-pollsters-option

Change-Id: I3512f6023c3c417a02b1c699ee9b7626af0ae678
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2013-06-12 16:01:51 +02:00
parent 1103cb5839
commit 995855492e
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ceilometer/central/manager.py
View File

@ -18,22 +18,14 @@
from keystoneclient.v2_0 import client as ksclient from keystoneclient.v2_0 import client as ksclient
from oslo.config import cfg from oslo.config import cfg
from stevedore import extension
from ceilometer import agent from ceilometer import agent
from ceilometer import extension_manager
from ceilometer.openstack.common import log from ceilometer.openstack.common import log
from ceilometer.openstack.common import service as os_service from ceilometer.openstack.common import service as os_service
from ceilometer.openstack.common.rpc import service as rpc_service from ceilometer.openstack.common.rpc import service as rpc_service
from ceilometer import 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') cfg.CONF.import_group('service_credentials', 'ceilometer.service')
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
@ -60,10 +52,10 @@ class AgentManager(agent.AgentManager):
def __init__(self): def __init__(self):
super(AgentManager, self).__init__( super(AgentManager, self).__init__(
extension_manager.ActivatedExtensionManager( extension.ExtensionManager(
namespace='ceilometer.poll.central', namespace='ceilometer.poll.central',
disabled_names=cfg.CONF.disabled_central_pollsters, invoke_on_load=True,
), )
) )
def create_polling_task(self): def create_polling_task(self):

1
doc/source/configuration.rst
View File

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

10
etc/ceilometer/ceilometer.conf.sample
View File

@ -39,14 +39,6 @@
#enable_v1_api=true #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 # Options defined in ceilometer.compute
# #
@ -633,4 +625,4 @@
#password=<None> #password=<None>
# Total option count: 120 # Total option count: 119