Merge "NSX|V3: Do not fail on router rollback"

This commit is contained in:
Zuul 2018-11-01 11:45:35 +00:00 committed by Gerrit Code Review
commit 486c64c25e

View File

@ -4396,8 +4396,13 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
LOG.error("Neutron failed to add_router_interface on "
"router %s, and would try to rollback.",
router_id)
self.remove_router_interface(
context, router_id, interface_info)
try:
self.remove_router_interface(
context, router_id, interface_info)
except Exception:
# rollback also failed
LOG.error("Neutron rollback failed to remove router "
"interface on router %s.", router_id)
return info
def remove_router_interface(self, context, router_id, interface_info):