openstack
/
neutron
Code Issues Proposed changes

Fix "failed unplugging ha interface" error when deleting router 

Deleting router namespaces happens before deleting router ha interface.
So it will fail when deleting router ha interface. The change
is to remove router ha interface before deleting router namespace.

Change-Id: I3d936701c9dac7671f12e1966449662988a0f26a
Closes-Bug: #1629159
Related-Bug: #1488730
(cherry picked from commit bc03048134)
This commit is contained in:
Perry Zou 2016-09-30 02:42:56 +00:00 committed by Kevin Benton
parent d360c33fcd
commit bd982c721f
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/agent/l3/ha_router.py
View File

@ -377,10 +377,10 @@ class HaRouter(router.RouterInfo):
prefix=router.EXTERNAL_DEV_PREFIX)
def delete(self, agent):
super(HaRouter, self).delete(agent)
self.destroy_state_change_monitor(self.process_monitor)
self.ha_network_removed()
self.disable_keepalived()
self.ha_network_removed()
super(HaRouter, self).delete(agent)
def process(self, agent):
super(HaRouter, self).process(agent)