From fcc31ec0f43a555afd1efbc659901dac299b5b0b Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 21 Apr 2016 15:24:52 -0400 Subject: [PATCH] Properly disable the L3 agent scheduler. Change-Id: I9a4213e51ffaee784c8c4c99953fa306deef624a Closes-bug: #1573226 --- astara_neutron/plugins/ml2_neutron_plugin.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/astara_neutron/plugins/ml2_neutron_plugin.py b/astara_neutron/plugins/ml2_neutron_plugin.py index 1290206..bb6493d 100644 --- a/astara_neutron/plugins/ml2_neutron_plugin.py +++ b/astara_neutron/plugins/ml2_neutron_plugin.py @@ -43,7 +43,6 @@ class Ml2Plugin(plugin.Ml2Plugin): disabled_extensions = [ neutron_constants.DHCP_AGENT_SCHEDULER_EXT_ALIAS, - neutron_constants.L3_AGENT_SCHEDULER_EXT_ALIAS, neutron_constants.LBAAS_AGENT_SCHEDULER_EXT_ALIAS ] for ext in disabled_extensions: @@ -169,3 +168,9 @@ class L3RouterPlugin(l3_router_plugin.L3RouterPlugin): def create_router(self, context, router): router['router']['ha'] = self._is_ha(router['router']) return self._create_router(context, router) + +if neutron_constants.L3_AGENT_SCHEDULER_EXT_ALIAS in \ + L3RouterPlugin.supported_extension_aliases: + L3RouterPlugin.supported_extension_aliases.remove( + neutron_constants.L3_AGENT_SCHEDULER_EXT_ALIAS + )