openstack
/
neutron
Code Issues Proposed changes

l3_db: Fix a regression in the recent CommonDbMixin change 

The recently merged change [1] modified the logic in the way
to break deployments without dns-integration.  It broke
networking-midonet gate jobs.

[1] If1252c42c49cd59dba7ec7c02c9b887fdc169f51

Closes-Bug: #1686584
Change-Id: I80696fa1227d1d36ae67d8f2b70e4206c4cdcd70
This commit is contained in:
YAMAMOTO Takashi 2017-04-27 14:05:07 +09:00
parent 03c5283c69
commit 98373690b2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/db/l3_db.py
View File

@ -1299,8 +1299,8 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
self._process_dns_floatingip_create_postcommit(context,
floatingip_dict,
dns_data)
resource_extend.apply_funcs(l3.FLOATINGIPS, floatingip_dict,
floatingip_db)
resource_extend.apply_funcs(l3.FLOATINGIPS, floatingip_dict,
floatingip_db)
return floatingip_dict
@db_api.retry_if_session_inactive()
@ -1330,8 +1330,8 @@ class L3_NAT_dbonly_mixin(l3.RouterPluginBase,
self._process_dns_floatingip_update_postcommit(context,
floatingip_dict,
dns_data)
resource_extend.apply_funcs(l3.FLOATINGIPS, floatingip_dict,
floatingip_db)
resource_extend.apply_funcs(l3.FLOATINGIPS, floatingip_dict,
floatingip_db)
return old_floatingip, floatingip_dict
def _floatingips_to_router_ids(self, floatingips):