From: Kefu Chai <kchai@redhat.com>
Date: Thu, 28 Mar 2019 02:34:55 +0000 (+0800)
Subject: ceph-disk/tests: use random unused port for CEPH_MON
X-Git-Tag: v13.2.6~78^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ea544f0ff7eb016b089f031d6ea81f51d06cbb9;p=ceph.git

ceph-disk/tests: use random unused port for CEPH_MON

Fixes: http://tracker.ceph.com/issues/39066
Signed-off-by: Kefu Chai <kchai@redhat.com>

Conflicts:
	src/ceph-disk/tests/ceph-disk.sh: this change is not
cherry-picked from master. because ceph-disk was removed in nautilus. and
we need to run multiple luminous tests in parallel, hence the change.
---

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
index dcee7e14d6cc..2a9fe7006fa5 100755
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -436,7 +436,7 @@ function run() {
     CEPH_DISK_ARGS+=" --statedir=$dir"
     CEPH_DISK_ARGS+=" --sysconfdir=$dir"
 
-    export CEPH_MON="127.0.0.1:7451" # git grep '\<7451\>' : there must be only one
+    export CEPH_MON="127.0.0.1:$(get_unused_port)"
     export CEPH_ARGS
     CEPH_ARGS+=" --fsid=$(uuidgen)"
     CEPH_ARGS+=" --auth-supported=none"