openstack
/
neutron
Code Issues Proposed changes

Merge "_create_subnet_from_implicit_pool assumes external network extension"

This commit is contained in:
Jenkins 2015-04-21 04:19:47 +00:00 committed by Gerrit Code Review
parent 5171544191 bde4f6f767
commit cc020dc930
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/db_base_plugin_v2.py
View File

@ -1260,7 +1260,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
s['dns_nameservers'],
s['host_routes'],
s['allocation_pools'])
if network.external:
if hasattr(network, 'external') and network.external:
self._update_router_gw_ports(context,
subnet['id'],
subnet['network_id'])
@ -1286,7 +1286,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
s['dns_nameservers'],
s['host_routes'],
s['allocation_pools'])
if network.external:
if hasattr(network, 'external') and network.external:
self._update_router_gw_ports(context,
subnet['id'],
subnet['network_id'])