openstack
/
neutron
Code Issues Proposed changes

Merge "Don't raise FileNotFoundError during disabling keepalived" into stable/ussuri

This commit is contained in:
Zuul 2020-09-03 15:01:11 +00:00 committed by Gerrit Code Review
parent d2d90d3e08 7fd54d0876
commit 680383ad0d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/agent/l3/ha_router.py
View File

@ -199,7 +199,10 @@ class HaRouter(router.RouterInfo):
return return
self.keepalived_manager.disable() self.keepalived_manager.disable()
conf_dir = self.keepalived_manager.get_conf_dir() conf_dir = self.keepalived_manager.get_conf_dir()
shutil.rmtree(conf_dir) try:
shutil.rmtree(conf_dir)
except FileNotFoundError:
pass
def _get_keepalived_instance(self): def _get_keepalived_instance(self):
return self.keepalived_manager.config.get_instance(self.ha_vr_id) return self.keepalived_manager.config.get_instance(self.ha_vr_id)