From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 7 May 2018 16:00:02 +0000 (-0400)
Subject: qa/workunits/rbd: don't override rbd-mirror logs if running under teuthology
X-Git-Tag: v14.0.0~95^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1bb6d4fd89c6434de9441581f125eb8ef55c6d07;p=ceph.git

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

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/workunits/rbd/rbd_mirror_helpers.sh b/qa/workunits/rbd/rbd_mirror_helpers.sh
index caa87aa02234..351cdbbaf0c1 100755
--- 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 \