Don't enforce qos ml2 extension driver

It's now enabled in gate for feature/qos, so return to the original
version of the code.

Depends-On: I421c42aef2cf558935f91a6634a5a5b16e55a606
Change-Id: I5875fb24b7c95efb3bd7cd548bd5d9d21d6544ba

diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py
index 867ee9668aafb905c7f4d8ac9aa3ac5dcc6c1de4..0de60e5d624b6c420d286b67beaad33480b8cb8d 100644 (file)
--- a/neutron/plugins/ml2/managers.py
+++ b/neutron/plugins/ml2/managers.py
@@ -723,14 +723,10 @@ class ExtensionManager(stevedore.named.NamedExtensionManager):
         # the order in which the drivers are called.
         self.ordered_ext_drivers = []
 
-        #TODO(QoS): enforce qos extension until we enable it in devstack-gate
-        drivers = cfg.CONF.ml2.extension_drivers
-        if 'qos' not in drivers:
-            drivers += ['qos']
         LOG.info(_LI("Configured extension driver names: %s"),
-                 drivers)
+                 cfg.CONF.ml2.extension_drivers)
         super(ExtensionManager, self).__init__('neutron.ml2.extension_drivers',
-                                               drivers,
+                                               cfg.CONF.ml2.extension_drivers,
                                                invoke_on_load=True,
                                                name_order=True)
         LOG.info(_LI("Loaded extension driver names: %s"), self.names())