From 53f9534ece265de0705b5e051b4f82dc46595e2d Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Fri, 15 Jul 2016 11:32:42 +0800 Subject: [PATCH] [devstack]Only cleanup tftp directory if ipxe disabled There's no need to cleanup ironic-inspector.* if ipxe enabled Change-Id: I07f981773441914105e006ef2133ae4cc05b1df9 --- devstack/plugin.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e911c9056..9a4f8c2e7 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -274,10 +274,11 @@ function create_ironic_inspector_cache_dir { } function cleanup_inspector { - rm -f $IRONIC_TFTPBOOT_DIR/pxelinux.cfg/default - rm -f $IRONIC_TFTPBOOT_DIR/ironic-inspector.* if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then rm -f $IRONIC_HTTP_DIR/ironic-inspector.* + else + rm -f $IRONIC_TFTPBOOT_DIR/pxelinux.cfg/default + rm -f $IRONIC_TFTPBOOT_DIR/ironic-inspector.* fi sudo rm -f /etc/sudoers.d/ironic-inspector-rootwrap sudo rm -rf $IRONIC_INSPECTOR_AUTH_CACHE_DIR