Merge "Remove deprecated gnocchi_dispatcher option group"

This commit is contained in:
Zuul 2018-07-03 14:35:00 +00:00 committed by Gerrit Code Review
commit c721cffb01
3 changed files with 8 additions and 32 deletions

View File

@ -93,28 +93,6 @@ def list_opts():
help='Number of seconds between checks to see if group '
'membership has changed'),
]),
('dispatcher_gnocchi', (
cfg.StrOpt(
'filter_project',
deprecated_for_removal=True,
default='gnocchi',
help='Gnocchi project used to filter out samples '
'generated by Gnocchi service activity'),
cfg.StrOpt(
'archive_policy',
deprecated_for_removal=True,
help='The archive policy to use when the dispatcher '
'create a new metric.'),
cfg.StrOpt(
'resources_definition_file',
deprecated_for_removal=True,
default='gnocchi_resources.yaml',
help=('The Yaml file that defines mapping between samples '
'and gnocchi resources/metrics')),
cfg.FloatOpt(
'request_timeout', default=6.05, min=0.0,
deprecated_for_removal=True,
help='Number of seconds before request to gnocchi times out'))),
('event', ceilometer.event.converter.OPTS),
('hardware', itertools.chain(
ceilometer.hardware.discovery.OPTS,

View File

@ -198,25 +198,19 @@ class GnocchiPublisher(publisher.ConfigPublisherBase):
# TODO(jd) allow to override Gnocchi endpoint via the host in the URL
options = urlparse.parse_qs(parsed_url.query)
self.filter_project = options.get(
'filter_project',
[conf.dispatcher_gnocchi.filter_project])[-1]
self.filter_project = options.get('filter_project', [True])[-1]
resources_definition_file = options.get(
'resources_definition_file',
[conf.dispatcher_gnocchi.resources_definition_file])[-1]
'resources_definition_file', ['gnocchi_resources.yaml'])[-1]
archive_policy_override = options.get(
'archive_policy',
[conf.dispatcher_gnocchi.archive_policy])[-1]
archive_policy_override = options.get('archive_policy', [None])[-1]
self.resources_definition, self.archive_policies_definition = (
self._load_definitions(conf, archive_policy_override,
resources_definition_file))
self.metric_map = dict((metric, rd) for rd in self.resources_definition
for metric in rd.metrics)
timeout = options.get('timeout',
[conf.dispatcher_gnocchi.request_timeout])[-1]
timeout = options.get('timeout', [6.05])[-1]
self._ks_client = keystone_client.get_client(conf)
self.cache = None

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated `gnocchi_dispatcher` option group has been removed.