From: Michael Fritch <mfritch@suse.com>
Date: Fri, 28 Feb 2020 21:45:42 +0000 (-0700)
Subject: qa/workunits/cephadm/test_cephadm.sh: add `cleanup` function
X-Git-Tag: v15.1.1~195^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cc2fc9f5fdf520ecc955b9ab7bb8406c534d159;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: add `cleanup` function

moves logic for clean-up during `trap EXIT` into a function

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index ec8c330a07d8..15ed7f71475f 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -11,7 +11,12 @@ IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'docker.io/ceph/daemon-base:latest-nautilus'}
 IMAGE_MIMIC=${IMAGE_MIMIC:-'docker.io/ceph/daemon-base:latest-mimic'}
 
 TMPDIR=$(mktemp -d)
-trap "rm -rf $TMPDIR" EXIT
+
+function cleanup()
+{
+    rm -rf $TMPDIR
+}
+trap cleanup EXIT
 
 OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img"
 OSD_IMAGE_SIZE='6G'