diff options
author | Kefu Chai <kchai@redhat.com> | 2017-03-22 16:33:30 +0100 |
---|---|---|
committer | Kefu Chai <kchai@redhat.com> | 2017-03-23 17:55:40 +0100 |
commit | 0578177569749b03cfe4180de4f827e6537c9a4e (patch) | |
tree | 1b6a899ce88358ac05e95899e4f61f154ad11c96 | |
parent | vstart.sh: remove start_* (diff) | |
download | ceph-0578177569749b03cfe4180de4f827e6537c9a4e.tar.xz ceph-0578177569749b03cfe4180de4f827e6537c9a4e.zip |
tests: remove mds,osd,mon args passed to vstart.sh
Signed-off-by: Kefu Chai <kchai@redhat.com>
-rw-r--r-- | doc/dev/dev_cluster_deployement.rst | 2 | ||||
-rwxr-xr-x | src/test/ceph_objectstore_tool.py | 2 | ||||
-rwxr-xr-x | src/test/cephtool-test-mds.sh | 2 | ||||
-rwxr-xr-x | src/test/cephtool-test-mon.sh | 2 | ||||
-rwxr-xr-x | src/test/cephtool-test-osd.sh | 2 | ||||
-rwxr-xr-x | src/test/cephtool-test-rados.sh | 2 | ||||
-rwxr-xr-x | src/test/mon/run_test.sh | 2 | ||||
-rwxr-xr-x | src/test/vstart_wrapper.sh | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/doc/dev/dev_cluster_deployement.rst b/doc/dev/dev_cluster_deployement.rst index 05b767ccca8..2f910750f79 100644 --- a/doc/dev/dev_cluster_deployement.rst +++ b/doc/dev/dev_cluster_deployement.rst @@ -12,7 +12,7 @@ It allows to deploy a fake local cluster on your machine for development purpose To start your development cluster, type the following:: - vstart.sh [OPTIONS]... [mon] [osd] [mds] + vstart.sh [OPTIONS]... In order to stop the cluster, you can type:: diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index c63e3ec2950..ac68228a4e4 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -152,7 +152,7 @@ def cat_file(level, filename): def vstart(new, opt=""): print("vstarting....", end="") NEW = new and "-n" or "-N" - call("MON=1 OSD=4 CEPH_PORT=7400 {path}/src/vstart.sh --short -l {new} -d mon osd {opt} > /dev/null 2>&1".format(new=NEW, opt=opt, path=CEPH_ROOT), shell=True) + call("MON=1 OSD=4 MDS=0 MGR=0 CEPH_PORT=7400 {path}/src/vstart.sh --short -l {new} -d {opt} > /dev/null 2>&1".format(new=NEW, opt=opt, path=CEPH_ROOT), shell=True) print("DONE") diff --git a/src/test/cephtool-test-mds.sh b/src/test/cephtool-test-mds.sh index 463f2d4557d..93ea99b4f85 100755 --- a/src/test/cephtool-test-mds.sh +++ b/src/test/cephtool-test-mds.sh @@ -18,7 +18,7 @@ source $(dirname $0)/detect-build-env-vars.sh CEPH_CLI_TEST_DUP_COMMAND=1 \ -MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 $CEPH_ROOT/src/test/vstart_wrapper.sh \ +MDS=1 MON=1 OSD=3 MGR=0 CEPH_PORT=7200 $CEPH_ROOT/src/test/vstart_wrapper.sh \ $CEPH_ROOT/qa/workunits/cephtool/test.sh \ --test-mds \ --asok-does-not-need-root diff --git a/src/test/cephtool-test-mon.sh b/src/test/cephtool-test-mon.sh index a3b1619ee13..8ca9dc8e393 100755 --- a/src/test/cephtool-test-mon.sh +++ b/src/test/cephtool-test-mon.sh @@ -20,7 +20,7 @@ source $(dirname $0)/detect-build-env-vars.sh CEPH_CLI_TEST_DUP_COMMAND=1 \ # uses CEPH_PORT going from 7202 7203 and 7204 because # it starts at 7202 and runs 3 mons (see vstart.sh) -MON=3 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 $CEPH_ROOT/src/test/vstart_wrapper.sh \ +MON=3 OSD=3 MDS=0 MGR=0 CEPH_PORT=7202 $CEPH_ROOT/src/test/vstart_wrapper.sh \ $CEPH_ROOT/qa/workunits/cephtool/test.sh \ --test-mon \ --asok-does-not-need-root diff --git a/src/test/cephtool-test-osd.sh b/src/test/cephtool-test-osd.sh index f5091a75f84..d513b287403 100755 --- a/src/test/cephtool-test-osd.sh +++ b/src/test/cephtool-test-osd.sh @@ -18,7 +18,7 @@ source $(dirname $0)/detect-build-env-vars.sh CEPH_CLI_TEST_DUP_COMMAND=1 \ -MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 $CEPH_ROOT/src/test/vstart_wrapper.sh \ +MON=1 OSD=3 MDS=0 MGR=0 CEPH_PORT=7201 $CEPH_ROOT/src/test/vstart_wrapper.sh \ $CEPH_ROOT/qa/workunits/cephtool/test.sh \ --test-osd \ --asok-does-not-need-root diff --git a/src/test/cephtool-test-rados.sh b/src/test/cephtool-test-rados.sh index f7766c2a792..1b8dd09413a 100755 --- a/src/test/cephtool-test-rados.sh +++ b/src/test/cephtool-test-rados.sh @@ -17,5 +17,5 @@ source $(dirname $0)/detect-build-env-vars.sh CEPH_CLI_TEST_DUP_COMMAND=1 \ -MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7205 $CEPH_ROOT/src/test/vstart_wrapper.sh \ +MON=1 OSD=3 MDS=0 MGR=0 CEPH_PORT=7205 $CEPH_ROOT/src/test/vstart_wrapper.sh \ $CEPH_ROOT/src/test/test_rados_tool.sh diff --git a/src/test/mon/run_test.sh b/src/test/mon/run_test.sh index a6cbff7fb73..ef2f6d063ec 100755 --- a/src/test/mon/run_test.sh +++ b/src/test/mon/run_test.sh @@ -57,7 +57,7 @@ make_fresh() { exit 1 fi - env CEPH_NUM_MON=3 CEPH_NUM_OSD=2 CEPH_NUM_MDS=1 \ + env MON=3 OSD=0 MDS=0 MGR=0 \ ./vstart.sh -n -l -d mon } diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh index 2e05608799c..62cd6e16b8a 100755 --- a/src/test/vstart_wrapper.sh +++ b/src/test/vstart_wrapper.sh @@ -33,7 +33,7 @@ function vstart_setup() $CEPH_ROOT/src/vstart.sh \ --short \ -o 'paxos propose interval = 0.01' \ - -n -l $CEPH_START || return 1 + -n -l || return 1 export CEPH_CONF=$CEPH_DIR/ceph.conf crit=$(expr 100 - $(ceph-conf --show-config-value mon_data_avail_crit)) |