summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-27 09:48:51 +0000
committerGerrit Code Review <review@openstack.org>2017-07-27 09:48:51 +0000
commit237bee37f87c2b2576944ca6a774503b9c9e2248 (patch)
tree78552a2f1bae20ac64f76e7c68103976880948b0
parent5d34fb847eef3815f357ad0d069e2d41baa4a60c (diff)
parent62128ecf4b111f5db9d0e81e958e924220856a14 (diff)
Merge "conf: Deprecate 'masakari_topic' RPC options"
-rw-r--r--masakari/conf/engine.py6
-rw-r--r--releasenotes/notes/deprecate-topic-opt-af83f82143143c61.yaml5
2 files changed, 11 insertions, 0 deletions
diff --git a/masakari/conf/engine.py b/masakari/conf/engine.py
index 225360a..4d481a3 100644
--- a/masakari/conf/engine.py
+++ b/masakari/conf/engine.py
@@ -19,6 +19,12 @@ from oslo_config import cfg
19rpcapi_opts = [ 19rpcapi_opts = [
20 cfg.StrOpt("masakari_topic", 20 cfg.StrOpt("masakari_topic",
21 default="ha_engine", 21 default="ha_engine",
22 deprecated_for_removal=True,
23 deprecated_since='3.0.0',
24 deprecated_reason="""
25Configurable RPC topic provides little value and it can easily break
26Masakari if operator configures it to the same topic used by other OpenStack
27services.""",
22 help=""" 28 help="""
23This is the message queue topic that the masakari engine 'listens' on. It is 29This is the message queue topic that the masakari engine 'listens' on. It is
24used when the masakari engine is started up to configure the queue, and 30used when the masakari engine is started up to configure the queue, and
diff --git a/releasenotes/notes/deprecate-topic-opt-af83f82143143c61.yaml b/releasenotes/notes/deprecate-topic-opt-af83f82143143c61.yaml
new file mode 100644
index 0000000..48c3c06
--- /dev/null
+++ b/releasenotes/notes/deprecate-topic-opt-af83f82143143c61.yaml
@@ -0,0 +1,5 @@
1---
2deprecations:
3 - |
4 The ``masakari_topic`` config option is now deprecated and will be removed
5 in the Queens release.