Merge "Remove deprecated gnocchi_dispatcher option group"

ceilometer/opts.py

@@ -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,

ceilometer/publisher/gnocchi.py

@@ -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(
+        self.filter_project = options.get('filter_project', [True])[-1]
-            'filter_project',
-            [conf.dispatcher_gnocchi.filter_project])[-1]
 
         resources_definition_file = options.get(
-            'resources_definition_file',
+            'resources_definition_file', ['gnocchi_resources.yaml'])[-1]
-            [conf.dispatcher_gnocchi.resources_definition_file])[-1]
 
-        archive_policy_override = options.get(
+        archive_policy_override = options.get('archive_policy', [None])[-1]
-            'archive_policy',
-            [conf.dispatcher_gnocchi.archive_policy])[-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',
+        timeout = options.get('timeout', [6.05])[-1]
-                              [conf.dispatcher_gnocchi.request_timeout])[-1]
         self._ks_client = keystone_client.get_client(conf)
 
         self.cache = None

releasenotes/notes/remove-gnocchi-dispatcher-options-4f4ba2a155c1a766.yaml

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