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
This commit is contained in:
Stephen Finucane 2018-01-03 13:43:56 +00:00
parent 877a8bcb9f
commit 44181a5a20
3 changed files with 26 additions and 13 deletions

View File

@ -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):

View File

@ -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):

View File

@ -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``