]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test: Add optional arg to vstart() to provide additional args to vstart
authorDavid Zafman <dzafman@redhat.com>
Tue, 31 Mar 2015 00:33:46 +0000 (17:33 -0700)
committerDavid Zafman <dzafman@redhat.com>
Wed, 13 May 2015 20:09:13 +0000 (13:09 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
src/test/ceph_objectstore_tool.py

index 3691774746694d8e984dea612c2cd27dae30681b..504c97d61fc65e1cd4fa4e45baf0113fea9f5259 100755 (executable)
@@ -124,10 +124,10 @@ def cat_file(level, filename):
     print "<EOF>"
 
 
-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"