openstack
/
astara-neutron
Code Issues Proposed changes

Merge "Disable dhcp agent scheduler by appropriate alias"

This commit is contained in:
Jenkins 2015-05-07 19:44:45 +00:00 committed by Gerrit Code Review
parent 933b6e375d 4af59ab87c
commit a417a9f415
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
akanda/neutron/plugins/ml2_neutron_plugin.py
View File

@ -17,6 +17,7 @@
import re
import netaddr
from neutron.common import constants as neutron_constants
from neutron.db import l3_db
from neutron.plugins.ml2 import plugin
from neutron.services.l3_router import l3_router_plugin
@ -38,10 +39,16 @@ class Ml2Plugin(floatingip.ExplicitFloatingIPAllocationMixin,
["dhrouterstatus"]
)
try:
_supported_extension_aliases.remove('agent_scheduler')
except ValueError:
pass
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:
try:
_supported_extension_aliases.remove(ext)
except ValueError:
pass
@akanda.auto_add_ipv6_subnet
def create_network(self, context, network):