From 09cb8a41ed6a9642978e399b426b21704c704f46 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 30 Mar 2015 17:33:46 -0700 Subject: [PATCH] test: Add optional arg to vstart() to provide additional args to vstart Signed-off-by: David Zafman (cherry picked from commit dff17a800c9cc1cf0cc23d70479c031aa8e9cbfc) --- src/test/ceph_objectstore_tool.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 3691774746694..504c97d61fc65 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -124,10 +124,10 @@ def cat_file(level, filename): print "" -def vstart(new): +def vstart(new, opt=""): print "vstarting....", - OPT = new and "-n" or "" - call("MON=1 OSD=4 CEPH_PORT=7400 ./vstart.sh -l {opt} -d mon osd > /dev/null 2>&1".format(opt=OPT), shell=True) + NEW = new and "-n" or "" + call("MON=1 OSD=4 CEPH_PORT=7400 ./vstart.sh -l {new} -d mon osd {opt} > /dev/null 2>&1".format(new=NEW, opt=opt), shell=True) print "DONE" -- 2.39.5