From: Sage Weil <sage@redhat.com>
Date: Wed, 20 Nov 2019 02:41:17 +0000 (-0600)
Subject: qa/standalone/test_ceph_daemon.sh: fix overwrites of temp files
X-Git-Tag: v15.1.0~815^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cb67545e9933cf0e571fb1f3a1679124e247cc5e;p=ceph-ci.git

qa/standalone/test_ceph_daemon.sh: fix overwrites of temp files

mktemp creates these files, so we have to pass --allow-overwrite (or
delete them after we get the unique name but before we write to them--this
is easier).

Broken by c7fe27a72a61d1345a66b8830fd17e7b922abd44

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh
index 23d42df3847..7511437107e 100755
--- a/qa/standalone/test_ceph_daemon.sh
+++ b/qa/standalone/test_ceph_daemon.sh
@@ -105,7 +105,8 @@ $SUDO $CEPH_DAEMON --image $IMAGE_MASTER bootstrap \
       --fsid $FSID \
       --config $ORIG_CONFIG \
       --output-config $CONFIG \
-      --output-keyring $KEYRING
+      --output-keyring $KEYRING \
+      --allow-overwrite
 test -e $CONFIG
 test -e $KEYRING
 rm -f $ORIG_CONFIG