openstack
/
neutron
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2020-11-12 02:32:08 +00:00 committed by Gerrit Code Review
parent 8077d16ce8 da7e9c5408
commit 88d95ab1f2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import errno
import os
import shutil
import signal
@ -194,7 +195,11 @@ 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 EnvironmentError as e:
if e.errno != errno.ENOENT:
raise
def _get_keepalived_instance(self):
return self.keepalived_manager.config.get_instance(self.ha_vr_id)