From e683c41521647d1c67bbdeb9c7e126c603676fb4 Mon Sep 17 00:00:00 2001
From: Dan Smith <dansmith@redhat.com>
Date: Wed, 24 Feb 2016 10:32:25 -0800
Subject: [PATCH] Deprecate conductor manager option

The scheduler and cells ones are already deprecated, and the compute one
went away long ago. This deprecates it so we can remove it in Newton.

Change-Id: I93ac3f30524b254f2b14625f6910c496e32f5401
---
 nova/conf/conductor.py                                      | 6 ++++--
 .../deprecate-conductor-manager-class-03620676d939b0eb.yaml | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-conductor-manager-class-03620676d939b0eb.yaml

diff --git a/nova/conf/conductor.py b/nova/conf/conductor.py
index 70a3b8335d..b32ec38ec8 100644
--- a/nova/conf/conductor.py
+++ b/nova/conf/conductor.py
@@ -27,7 +27,7 @@ use_local = cfg.BoolOpt(
          'the transition to the conductor service. It no longer '
          'represents a reasonable alternative for deployers. '
          'Removal may be as early as 14.0',
-    deprecated_for_removal='True')
+    deprecated_for_removal=True)
 
 topic = cfg.StrOpt(
     'topic',
@@ -37,7 +37,9 @@ topic = cfg.StrOpt(
 manager = cfg.StrOpt(
     'manager',
     default='nova.conductor.manager.ConductorManager',
-    help='Full class name for the Manager for conductor')
+    help=('DEPRECATED: Full class name for the Manager for conductor. '
+          'Removal in 14.0'),
+    deprecated_for_removal=True)
 
 workers = cfg.IntOpt(
     'workers',
diff --git a/releasenotes/notes/deprecate-conductor-manager-class-03620676d939b0eb.yaml b/releasenotes/notes/deprecate-conductor-manager-class-03620676d939b0eb.yaml
new file mode 100644
index 0000000000..5e0c34a865
--- /dev/null
+++ b/releasenotes/notes/deprecate-conductor-manager-class-03620676d939b0eb.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - The conductor.manager configuration option is now deprecated and
+    will be removed.