From a0b58d4bf78a9dbf9ee90e0c24085a0aec17d163 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/service.py | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/nova/conf/service.py b/nova/conf/service.py
index d99cdab7c..6a57efa1c 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):