From 37849a36a8b90be62618e55eb347177ad0944d86 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Thu, 19 Sep 2019 10:48:07 -0500
Subject: [PATCH] test,misc: do not specify pg_num per pool

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/script/gen-corpus.sh                        | 2 +-
 src/test/cli-integration/rbd/formatted-output.t | 2 +-
 src/test/cli-integration/rbd/snap-diff.t        | 2 +-
 src/test/cli-integration/rbd/unmap.t            | 2 +-
 src/test/common/get_command_descriptions.cc     | 2 +-
 src/vstart.sh                                   | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/script/gen-corpus.sh b/src/script/gen-corpus.sh
index 018e2bd9d08..ad2ef09f1a1 100755
--- a/src/script/gen-corpus.sh
+++ b/src/script/gen-corpus.sh
@@ -33,7 +33,7 @@ function run() {
 
     local old_path="$PATH"
     export PATH="bin:$PATH"
-    ceph osd pool create mypool 8
+    ceph osd pool create mypool
     rados -p mypool bench 10 write -b 123
     ceph osd out 0
     ceph osd in 0
diff --git a/src/test/cli-integration/rbd/formatted-output.t b/src/test/cli-integration/rbd/formatted-output.t
index 171e2a3e4dc..27ddfa6d4af 100644
--- a/src/test/cli-integration/rbd/formatted-output.t
+++ b/src/test/cli-integration/rbd/formatted-output.t
@@ -1,6 +1,6 @@
 ls on empty pool never containing images
 ========================================
-  $ ceph osd pool create rbd_other 8
+  $ ceph osd pool create rbd_other
   pool 'rbd_other' created
   $ rbd pool init rbd_other
   $ rados -p rbd rm rbd_directory >/dev/null 2>&1 || true
diff --git a/src/test/cli-integration/rbd/snap-diff.t b/src/test/cli-integration/rbd/snap-diff.t
index c0f56399c66..e2eea14d646 100644
--- a/src/test/cli-integration/rbd/snap-diff.t
+++ b/src/test/cli-integration/rbd/snap-diff.t
@@ -1,4 +1,4 @@
-  $ ceph osd pool create xrbddiff1 8
+  $ ceph osd pool create xrbddiff1
   pool 'xrbddiff1' created
   $ rbd pool init xrbddiff1
   $ rbd create --thick-provision --size 1M xrbddiff1/xtestdiff1 --no-progress
diff --git a/src/test/cli-integration/rbd/unmap.t b/src/test/cli-integration/rbd/unmap.t
index 6712abf2494..6aa4dfe9f83 100644
--- a/src/test/cli-integration/rbd/unmap.t
+++ b/src/test/cli-integration/rbd/unmap.t
@@ -5,7 +5,7 @@ Setup
   $ rbd create --size 1 img
   $ rbd snap create img@snap
   $ rbd create --size 1 anotherimg
-  $ ceph osd pool create custom 8 >/dev/null 2>&1
+  $ ceph osd pool create custom >/dev/null 2>&1
   $ rbd pool init custom
   $ rbd create --size 1 custom/img
   $ rbd snap create custom/img@snap
diff --git a/src/test/common/get_command_descriptions.cc b/src/test/common/get_command_descriptions.cc
index 108b3deec9d..aef74066a03 100644
--- a/src/test/common/get_command_descriptions.cc
+++ b/src/test/common/get_command_descriptions.cc
@@ -85,7 +85,7 @@ static void pull585()
   std::vector<MonCommand> mon_commands = {
     { "osd pool create "		       
       "name=pool,type=CephPoolname " 
-      "name=pg_num,type=CephInt,range=0 " 
+      "name=pg_num,type=CephInt,range=0,req=false "
       "name=pgp_num,type=CephInt,range=0,req=false" // !!! missing trailing space
       "name=properties,type=CephString,n=N,req=false,goodchars=[A-Za-z0-9-_.=]", 
       "create pool", "osd", "rw" }
diff --git a/src/vstart.sh b/src/vstart.sh
index 40267bd6853..b92a6c40643 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1195,7 +1195,7 @@ done
 if [ "$ec" -eq 1 ]; then
     ceph_adm <<EOF
 osd erasure-code-profile set ec-profile m=2 k=2
-osd pool create ec 8 8 erasure ec-profile
+osd pool create ec erasure ec-profile
 EOF
 fi
 
@@ -1205,7 +1205,7 @@ do_cache() {
         shift
         echo "creating cache for pool $p ..."
         ceph_adm <<EOF
-osd pool create ${p}-cache 8
+osd pool create ${p}-cache
 osd tier add $p ${p}-cache
 osd tier cache-mode ${p}-cache writeback
 osd tier set-overlay $p ${p}-cache
-- 
2.39.5