From: Rich Curran <rcurran@cisco.com>
Date: Fri, 6 Sep 2013 12:45:18 +0000 (-0400)
Subject: Load ML2 mech drivers as listed in ml2_conf.ini
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5bae5828d3ae5e614c88c5c0f1ffa768a1228feb;p=openstack-build%2Fneutron-build.git

Load ML2 mech drivers as listed in ml2_conf.ini

stevedore requires an additional parameter to be used (name_order=True) to
sort the loaded extensions to match the order used in the parameter "names".

bug 1221490

Change-Id: I614716c45d91cdf152650fba5ec8ced1e9c5aad4
---

diff --git a/neutron/plugins/ml2/managers.py b/neutron/plugins/ml2/managers.py
index e25d79d5a..9fc2e5bf5 100644
--- a/neutron/plugins/ml2/managers.py
+++ b/neutron/plugins/ml2/managers.py
@@ -117,7 +117,8 @@ class MechanismManager(stevedore.named.NamedExtensionManager):
                  cfg.CONF.ml2.mechanism_drivers)
         super(MechanismManager, self).__init__('neutron.ml2.mechanism_drivers',
                                                cfg.CONF.ml2.mechanism_drivers,
-                                               invoke_on_load=True)
+                                               invoke_on_load=True,
+                                               name_order=True)
         LOG.info(_("Loaded mechanism driver names: %s"), self.names())
         self._register_mechanisms()