From 56063f3262726daf5906baf90a981f9d88eaa9ed Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Fri, 24 Aug 2018 17:10:41 +0200
Subject: [PATCH] publisher: mark messaging topic options deprecated

Change-Id: Id652abb5b059029eff2f6fa91bc966cbe6b9a546
---
 ceilometer/publisher/messaging.py                           | 2 ++
 .../remove-publisher-topic-options-7a40787a3998921d.yaml    | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/remove-publisher-topic-options-7a40787a3998921d.yaml

diff --git a/ceilometer/publisher/messaging.py b/ceilometer/publisher/messaging.py
index 253cec5cb1..028ae42c30 100644
--- a/ceilometer/publisher/messaging.py
+++ b/ceilometer/publisher/messaging.py
@@ -41,11 +41,13 @@ NOTIFIER_OPTS = [
                default='metering',
                help='The topic that ceilometer uses for metering '
                'notifications.',
+               deprecated_for_removal=True,
                ),
     cfg.StrOpt('event_topic',
                default='event',
                help='The topic that ceilometer uses for event '
                'notifications.',
+               deprecated_for_removal=True,
                ),
     cfg.StrOpt('telemetry_driver',
                default='messagingv2',
diff --git a/releasenotes/notes/remove-publisher-topic-options-7a40787a3998921d.yaml b/releasenotes/notes/remove-publisher-topic-options-7a40787a3998921d.yaml
new file mode 100644
index 0000000000..d3fbb3fa91
--- /dev/null
+++ b/releasenotes/notes/remove-publisher-topic-options-7a40787a3998921d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    The notifier publisher options `metering_topic` and `event_topic` are
+    deprecated and will be removed. Use the `topic` query parameter in the
+    notifier publisher URL instead.