summaryrefslogtreecommitdiffstats
path: root/qa
diff options
context:
space:
mode:
authorKefu Chai <tchaikov@gmail.com>2017-11-01 16:08:55 +0100
committerGitHub <noreply@github.com>2017-11-01 16:08:55 +0100
commit2a3d3b87fe237855df15f23974c1e368e7c3c188 (patch)
tree7940794323f5bde086ddf972408a8b23ddf61b46 /qa
parentMerge pull request #15193 from mynaramana/arraycode (diff)
parentqa: stop testing deprecated "ceph osd create" (diff)
downloadceph-2a3d3b87fe237855df15f23974c1e368e7c3c188.tar.xz
ceph-2a3d3b87fe237855df15f23974c1e368e7c3c188.zip
Merge pull request #18659 from tchaikov/wip-21993
qa: stop testing deprecated "ceph osd create" Reviewed-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'qa')
-rwxr-xr-xqa/workunits/cephtool/test.sh11
1 files changed, 1 insertions, 10 deletions
diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index c63ea889041..6e3f0ebc793 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -1587,16 +1587,7 @@ function test_mon_osd()
# When CEPH_CLI_TEST_DUP_COMMAND is set, osd create
# is repeated and consumes two osd id, not just one.
#
- local next_osd
- if test "$CEPH_CLI_TEST_DUP_COMMAND" ; then
- next_osd=$((gap_start + 1))
- else
- next_osd=$gap_start
- fi
- id=`ceph osd create`
- [ "$id" = "$next_osd" ]
-
- next_osd=$((id + 1))
+ local next_osd=$gap_start
id=`ceph osd create $(uuidgen)`
[ "$id" = "$next_osd" ]