From 427fe9177f90db091685b937839dcc4dfe4c8a01 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Thu, 13 Nov 2014 17:21:48 +0100 Subject: [PATCH] tests: ceph_objectstore_tool.py run mon and osd on specific port By default vstart.sh runs MDS but they are not needed for the tests, only run mon and osd instead. Instead of using the default vstart.sh port which may conflict with a already running vstart.sh, set the CEPH_PORT=7400 which is not used by any other test run with make check. Signed-off-by: Loic Dachary (cherry picked from commit f04d4e7539bc8c1b6cf94db815f9dcdecc52faa2) --- src/test/ceph_objectstore_tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 1d54e8703175..793ca493ee63 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -108,7 +108,7 @@ def cat_file(level, filename): def vstart(new): print "vstarting....", OPT = new and "-n" or "" - call("OSD=4 ./vstart.sh -l {opt} -d > /dev/null 2>&1".format(opt=OPT), shell=True) + call("MON=1 OSD=4 CEPH_PORT=7400 ./vstart.sh -l {opt} -d mon osd > /dev/null 2>&1".format(opt=OPT), shell=True) print "DONE" -- 2.47.3