summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-06 23:27:39 +0000
committerGerrit Code Review <review@openstack.org>2017-06-06 23:27:39 +0000
commit96fbfe743af4c975a3dbddeafdeb454af6e85ba9 (patch)
tree800e6ed3ed54997f0efe738876bcce7ece3c9b37
parentf5643e1982583a43a5bdae8a7d45bf4d7f1179ca (diff)
parente6c1d6dc0f80a27eba29009cf7a6bf7be3bb9c75 (diff)
Merge "l3_ha_mode: call bulk _populate_mtu_and_subnets_for_ports" into stable/newton
-rw-r--r--neutron/db/l3_hamode_db.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/neutron/db/l3_hamode_db.py b/neutron/db/l3_hamode_db.py
index f395801..f6f3ae2 100644
--- a/neutron/db/l3_hamode_db.py
+++ b/neutron/db/l3_hamode_db.py
@@ -724,10 +724,13 @@ class L3_HA_NAT_db_mixin(l3_dvr_db.L3_NAT_with_dvr_db_mixin,
724 router[constants.HA_INTERFACE_KEY] = port_dict 724 router[constants.HA_INTERFACE_KEY] = port_dict
725 router[n_const.HA_ROUTER_STATE_KEY] = binding.state 725 router[n_const.HA_ROUTER_STATE_KEY] = binding.state
726 726
727 interfaces = []
727 for router in routers_dict.values(): 728 for router in routers_dict.values():
728 interface = router.get(constants.HA_INTERFACE_KEY) 729 interface = router.get(constants.HA_INTERFACE_KEY)
729 if interface: 730 if interface:
730 self._populate_mtu_and_subnets_for_ports(context, [interface]) 731 interfaces.append(interface)
732
733 self._populate_mtu_and_subnets_for_ports(context, interfaces)
731 734
732 # If this is a DVR+HA router, but the agent is question is in 'dvr' 735 # If this is a DVR+HA router, but the agent is question is in 'dvr'
733 # mode (as opposed to 'dvr_snat'), then we want to always return it 736 # mode (as opposed to 'dvr_snat'), then we want to always return it