Browse Source

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

changes/93/747293/6
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
680383ad0d
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      neutron/agent/l3/ha_router.py

+ 4
- 1
neutron/agent/l3/ha_router.py View File

@@ -199,7 +199,10 @@ class HaRouter(router.RouterInfo):
return
self.keepalived_manager.disable()
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):
return self.keepalived_manager.config.get_instance(self.ha_vr_id)


Loading…
Cancel
Save