Merge "conf: Deprecate 'network_manager'"
This commit is contained in:
commit
f76e402653
@ -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):
|
||||
|
Loading…
x
Reference in New Issue
Block a user