qa/workunits/rbd: don't override rbd-mirror logs if running under teuthology

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1bb6d4fd89c6434de9441581f125eb8ef55c6d07)

diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh
index caa87aa02234a9955e2ae84bc1aeddf2c77483aa..351cdbbaf0c1c066afe8d50a4bd15612254cf6ce 100755 (executable)
--- a/qa/workunits/rbd/rbd_mirror_helpers.sh
+++ b/qa/workunits/rbd/rbd_mirror_helpers.sh
@@ -223,6 +223,7 @@ setup_cluster()
 [client.${MIRROR_USER_ID_PREFIX}${instance}]
     admin socket = ${TEMPDIR}/rbd-mirror.\$cluster-\$name.asok
     pid file = ${TEMPDIR}/rbd-mirror.\$cluster-\$name.pid
+    log file = ${TEMPDIR}/rbd-mirror.${cluster}_daemon.${instance}.log
 EOF
     done
 }
@@ -326,7 +327,6 @@ start_mirror()
     rbd-mirror \
        --cluster ${cluster} \
         --id ${MIRROR_USER_ID_PREFIX}${instance} \
-       --log-file=${TEMPDIR}/rbd-mirror.${cluster}_daemon.${instance}.log \
        --rbd-mirror-delete-retry-interval=5 \
        --rbd-mirror-image-state-check-interval=5 \
        --rbd-mirror-journal-poll-age=1 \