From: Loic Dachary <loic@dachary.org>
Date: Fri, 3 Jan 2014 23:34:45 +0000 (+0100)
Subject: mon: get rid of --keyring /dev/null hack
X-Git-Tag: v0.77~49^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1041%2Fhead;p=ceph.git

mon: get rid of --keyring /dev/null hack

No longer necessary when --auth-supported=none

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index 3ec566ca8cde..2e0fa6f68d26 100755
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -25,9 +25,8 @@ export CEPH_ARGS="--conf /dev/null --auth-supported=none --mon-host=127.0.0.1"
 
 function run_mon() {
     ./ceph-mon --id a \
-        --public-addr=127.0.0.1 --mkfs --keyring /dev/null \
+        --public-addr=127.0.0.1 --mkfs \
         --fsid=$(uuidgen) --mon-data=$DIR --run-dir=$DIR
-    touch $DIR/keyring
 
     ./ceph-mon --id a \
         --chdir= \