]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: use absolute path for keyring
authorNoah Watkins <jayhawk@cs.ucsc.edu>
Sat, 14 Jul 2012 00:29:56 +0000 (17:29 -0700)
committerSage Weil <sage@inktank.com>
Sun, 15 Jul 2012 00:39:11 +0000 (17:39 -0700)
Stores absolute path to the generated keyring so that tests running in
other directories (e.g. src/java/test) can simply reference the
generated ceph.conf.

Signed-off-by: Noah Watkins <jawhawk@cs.ucsc.edu>
src/vstart.sh

index 1a5cf68349e7b1234597c2605686d86f206d4786..f6dece36e1b24f336a003a11a146d749a17abab2 100755 (executable)
@@ -22,7 +22,7 @@ MON_ADDR=""
 
 conf="ceph.conf"
 
-keyring_fn="keyring"
+keyring_fn="$PWD/keyring"
 osdmap_fn="/tmp/ceph_osdmap.$$"
 monmap_fn="/tmp/ceph_monmap.$$"
 
@@ -271,7 +271,7 @@ EOF
                        cat <<EOF >> $conf
 
 [client]
-        keyring = keyring
+        keyring = $keyring_fn
 
 [mds]
 $DAEMONOPTS