diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2016-10-13 12:23:04 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2016-11-07 11:41:19 +0100 |
| commit | 94f278ceedfc164f2609f36a4c5a791195274d64 (patch) | |
| tree | 7d4c4b6678586995df7ea9a2216c626e5f3066da /ceilometer/meter | |
| parent | 0ae3d307f6e7358018e95a771828ac6de4f60245 (diff) | |
| download | ceilometer-94f278ceedfc164f2609f36a4c5a791195274d64.tar.gz | |
meter.notifications: stop using global conf
Change-Id: I28c8f1485ccf0ed7a357c78e75c8cd7563965270
Diffstat (limited to 'ceilometer/meter')
| -rw-r--r-- | ceilometer/meter/notifications.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py index 458b4c86..4ce687de 100644 --- a/ceilometer/meter/notifications.py +++ b/ceilometer/meter/notifications.py @@ -170,18 +170,20 @@ class ProcessMeterNotifications(plugin_base.NotificationBase): plugin_manager = extension.ExtensionManager( namespace='ceilometer.event.trait_plugin') meters_cfg = declarative.load_definitions( - cfg.CONF, {}, cfg.CONF.meter.meter_definitions_cfg_file, + self.manager.conf, {}, + self.manager.conf.meter.meter_definitions_cfg_file, pkg_resources.resource_filename(__name__, "data/meters.yaml")) definitions = {} + disable_non_metric_meters = (self.manager.conf.notification. + disable_non_metric_meters) for meter_cfg in reversed(meters_cfg['metric']): if meter_cfg.get('name') in definitions: # skip duplicate meters LOG.warning(_LW("Skipping duplicate meter definition %s") % meter_cfg) continue - if (meter_cfg.get('volume') != 1 - or not cfg.CONF.notification.disable_non_metric_meters): + if (meter_cfg.get('volume') != 1 or not disable_non_metric_meters): try: md = MeterDefinition(meter_cfg, plugin_manager) except declarative.DefinitionException as e: |