From f71e5687f545a3b3b981b851d719bbab1cf49ddd Mon Sep 17 00:00:00 2001
From: Maciej Szankin <maciej.szankin@intel.com>
Date: Fri, 3 Mar 2017 15:30:06 -0600
Subject: [PATCH] conf: remove console_driver opt

console_driver opt has beed deprecated since Ocata and can be
removed from nova.

Change-Id: I12b6a29cd0bc355ac9c023c3fa14be9d409bf775
Implements: blueprint centralize-config-options-pike
---
 nova/conf/console.py                          | 19 -------------------
 ...e-console-driver-opt-07344dbc02badaa4.yaml |  5 +++++
 2 files changed, 5 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/remove-console-driver-opt-07344dbc02badaa4.yaml

diff --git a/nova/conf/console.py b/nova/conf/console.py
index a6d324112b9e..be803b17883d 100644
--- a/nova/conf/console.py
+++ b/nova/conf/console.py
@@ -26,25 +26,6 @@ which allows to select the console proxy service to connect to.
 """)
 
 default_opts = [
-    cfg.StrOpt('console_driver',
-        default='nova.console.xvp.XVPConsoleProxy',
-        deprecated_for_removal=True,
-        deprecated_since='15.0.0',
-        deprecated_reason="""
-This option no longer does anything. Previously this option had only two valid,
-in-tree values: nova.console.xvp.XVPConsoleProxy and
-nova.console.fake.FakeConsoleProxy. The latter of these was only used in tests
-and has since been replaced.
-""",
-        help="""
-nova-console-proxy is used to set up multi-tenant VM console access.
-This option allows pluggable driver program for the console session
-and represents driver to use for the console proxy.
-
-Possible values:
-
-* A string representing fully classified class name of console driver.
-"""),
     cfg.StrOpt('console_topic',
         default='console',
         deprecated_for_removal=True,
diff --git a/releasenotes/notes/remove-console-driver-opt-07344dbc02badaa4.yaml b/releasenotes/notes/remove-console-driver-opt-07344dbc02badaa4.yaml
new file mode 100644
index 000000000000..3987ea6eed95
--- /dev/null
+++ b/releasenotes/notes/remove-console-driver-opt-07344dbc02badaa4.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Configuration option ``console_driver`` in the ``DEFAULT`` group has
+    been deprecated since the Ocata release and is now removed.