Merge "modernize quantum config in proper place"

neutron/common/legacy.py

@@ -77,7 +77,6 @@ def modernize_quantum_config(config):
         'router_scheduler_driver',
         'rpc_backend',
         'service_plugins',
-        ('QUOTAS', 'quota_driver'),
         ('SECURITYGROUP', 'firewall_driver'),
     ]
 

neutron/manager.py

@@ -18,6 +18,7 @@
 
 from oslo.config import cfg
 
+from neutron.common import legacy
 from neutron.common import utils
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
@@ -115,6 +116,7 @@ class NeutronManager(object):
         except ImportError:
             LOG.exception(_("Error loading plugin"))
             raise Exception(_("Plugin not found. "))
+        legacy.modernize_quantum_config(cfg.CONF)
         self.plugin = plugin_klass()
 
         msg = validate_post_plugin_load()

neutron/quota.py

@@ -20,6 +20,7 @@ from oslo.config import cfg
 import webob
 
 from neutron.common import exceptions
+from neutron.common import legacy
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
 
@@ -51,6 +52,7 @@ quota_opts = [
 ]
 # Register the configuration options
 cfg.CONF.register_opts(quota_opts, 'QUOTAS')
+legacy.override_config(cfg.CONF, [('QUOTAS', 'quota_driver')])
 
 
 class ConfDriver(object):

neutron/services/loadbalancer/plugin.py

@@ -17,6 +17,7 @@
 
 from oslo.config import cfg
 
+from neutron.common import legacy
 from neutron.db import api as qdbapi
 from neutron.db.loadbalancer import loadbalancer_db
 from neutron.openstack.common import importutils
@@ -35,6 +36,7 @@ lbaas_plugin_opts = [
 ]
 
 cfg.CONF.register_opts(lbaas_plugin_opts, "LBAAS")
+legacy.override_config(cfg.CONF, [('LBAAS', 'driver_fqn')])
 
 
 class LoadBalancerPlugin(loadbalancer_db.LoadBalancerPluginDb):