openstack
/
neutron
Code Issues Proposed changes

Merge "Fix "failed unplugging ha interface" error when deleting router" into stable/newton

This commit is contained in:
Jenkins 2016-11-18 11:50:54 +00:00 committed by Gerrit Code Review
parent 7295beec36 bd982c721f
commit 0a9d17110e
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)