From 44181a5a20abd984e9aad976dad533e03f44cb10 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Wed, 3 Jan 2018 13:43:56 +0000
Subject: [PATCH] conf: Deprecate 'network_manager'

This is only used for nova-network and therefore can be deprecated. The
option is moved to the 'nova.conf.network' module like most other
nova-network options.

Change-Id: I7c247066099bba8bb1af0362c0fe2c275a15e84f
---
 nova/conf/network.py                          | 19 ++++++++++++++++++-
 nova/conf/service.py                          | 13 +------------
 ...re-nova-network-opts-38a69fb87f10bb9c.yaml |  7 +++++++
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/deprecate-more-nova-network-opts-38a69fb87f10bb9c.yaml

diff --git a/nova/conf/network.py b/nova/conf/network.py
index 12ebec0b60..d6d04ca5a2 100644
--- a/nova/conf/network.py
+++ b/nova/conf/network.py
@@ -1398,9 +1398,26 @@ Related options:
 ]
 
 
+service_opts = [
+    cfg.StrOpt('network_manager',
+        choices=[
+            'nova.network.manager.FlatManager',
+            'nova.network.manager.FlatDHCPManager',
+            'nova.network.manager.VlanManager',
+        ],
+        default='nova.network.manager.VlanManager',
+        deprecated_for_removal=True,
+        deprecated_since='18.0.0',
+        deprecated_reason="""
+nova-network is deprecated, as are any related configuration options.
+""",
+        help='Full class name for the Manager for network'),
+]
+
+
 ALL_DEFAULT_OPTS = (linux_net_opts + network_opts + ldap_dns_opts
                     + rpcapi_opts + driver_opts + floating_ip_opts
-                    + ipv6_opts + quota_opts)
+                    + ipv6_opts + quota_opts + service_opts)
 
 
 def register_opts(conf):
diff --git a/nova/conf/service.py b/nova/conf/service.py
index d99cdab7cc..6a57efa1cf 100644
--- a/nova/conf/service.py
+++ b/nova/conf/service.py
@@ -158,18 +158,7 @@ Possible Values:
 * Any positive integer
 * None (default value)
 """),
-    # NOTE(sdague): the network_manager has a bunch of different in
-    # tree classes that are still legit options. In Newton we should
-    # turn this into a selector.
-    cfg.StrOpt('network_manager',
-               choices=[
-                   'nova.network.manager.FlatManager',
-                   'nova.network.manager.FlatDHCPManager',
-                   'nova.network.manager.VlanManager',
-               ],
-               default='nova.network.manager.VlanManager',
-               help='Full class name for the Manager for network'),
-    ]
+]
 
 
 def register_opts(conf):
diff --git a/releasenotes/notes/deprecate-more-nova-network-opts-38a69fb87f10bb9c.yaml b/releasenotes/notes/deprecate-more-nova-network-opts-38a69fb87f10bb9c.yaml
new file mode 100644
index 0000000000..e809df8c45
--- /dev/null
+++ b/releasenotes/notes/deprecate-more-nova-network-opts-38a69fb87f10bb9c.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    The following options, found in ``DEFAULT``, were only used for configuring
+    nova-network and are, like nova-network itself, now deprecated.
+
+    - ``network_manager``