From 5656f3cc89b7bfb76dccfe234aa82c08fbb0fc2c Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Tue, 25 Aug 2020 15:06:04 +0200 Subject: [PATCH] Don't raise FileNotFoundError during disabling keepalived In case when keepalived's config is not existing already, there is no need to raise any exception while L3 agent is trying to clean this config. Change-Id: I9ec81ad0c10379294d3145c5902e8b81b65c0221 Closes-Bug: #1892866 (cherry picked from commit a08893368a9f323d41f490ee043ef7bd50c4f1fa) --- neutron/agent/l3/ha_router.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neutron/agent/l3/ha_router.py b/neutron/agent/l3/ha_router.py index a794402f109..79fc1647434 100644 --- a/neutron/agent/l3/ha_router.py +++ b/neutron/agent/l3/ha_router.py @@ -197,7 +197,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)