From 4106079180bde2e989511d1781fb7ea319098310 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 24 Aug 2018 17:13:26 +0200
Subject: [PATCH] notifications: remove deprecated meter_definitions_cfg_file
 option

Change-Id: Ia9393b0fc3cf6a68f303f66dbf4aae32d9edba90
---
 ceilometer/meter/notifications.py                 | 15 ---------------
 ...ter-definitions-cfg-file-d57c726d563d805f.yaml |  4 ++++
 2 files changed, 4 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/remove-meter-definitions-cfg-file-d57c726d563d805f.yaml

diff --git a/ceilometer/meter/notifications.py b/ceilometer/meter/notifications.py
index 3ea9843cda..765b9e7cff 100644
--- a/ceilometer/meter/notifications.py
+++ b/ceilometer/meter/notifications.py
@@ -15,7 +15,6 @@ import itertools
 import os
 import re
 
-import pkg_resources
 import six
 
 from oslo_config import cfg
@@ -28,15 +27,6 @@ from ceilometer.pipeline import sample as endpoint
 from ceilometer import sample as sample_util
 
 OPTS = [
-    cfg.StrOpt('meter_definitions_cfg_file',
-               deprecated_for_removal=True,
-               help="Configuration file for defining meter "
-                    "notifications. This option is deprecated "
-                    "and use meter_definitions_dirs to "
-                    "configure meter notification file. Meter "
-                    "definitions configuration file will be sought "
-                    "according to the parameter."
-               ),
     cfg.MultiStrOpt('meter_definitions_dirs',
                     default=["/etc/ceilometer/meters.d",
                              os.path.abspath(
@@ -200,11 +190,6 @@ class ProcessMeterNotifications(endpoint.SampleEndpoint):
             for filepath in sorted(glob.glob(os.path.join(dir, "*.yaml"))):
                 if filepath is not None:
                     mfs.append(filepath)
-        if self.conf.meter.meter_definitions_cfg_file is not None:
-            mfs.append(
-                pkg_resources.resource_filename(
-                    self.conf.meter.meter_definitions_cfg_file)
-            )
         for mf in mfs:
             meters_cfg = declarative.load_definitions(
                 self.conf, {}, mf)
diff --git a/releasenotes/notes/remove-meter-definitions-cfg-file-d57c726d563d805f.yaml b/releasenotes/notes/remove-meter-definitions-cfg-file-d57c726d563d805f.yaml
new file mode 100644
index 0000000000..9311d822e5
--- /dev/null
+++ b/releasenotes/notes/remove-meter-definitions-cfg-file-d57c726d563d805f.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated `meter_definitions_cfg_file` option has been removed.