From 5c21e5d826f7e7d184224f3817d8b5ee7346ee9b Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sat, 18 Jul 2015 15:47:26 +0200 Subject: [PATCH] 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 --- neutron/plugins/ml2/managers.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py index 867ee9668..0de60e5d6 100644 --- 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()) -- 2.45.2