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