From: Kefu Chai <kchai@redhat.com>
Date: Wed, 1 Nov 2017 02:45:09 +0000 (+0800)
Subject: qa: stop testing deprecated "ceph osd create"
X-Git-Tag: v13.0.1~325^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=371d3f40911917704f4992c48236b4c60905bf4e;p=ceph-ci.git

qa: stop testing deprecated "ceph osd create"

"ceph osd create" is not idempotent, and is considered deprecated.

Fixes: http://tracker.ceph.com/issues/21993
Signed-off-by: Kefu Chai <kchai@redhat.com>
---

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" ]