diff options
| author | Noah Watkins <jayhawk@cs.ucsc.edu> | 2012-07-13 17:29:56 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-14 17:39:11 -0700 |
| commit | ed4f80f960b535d061dea782eb0799ce55f9463a (patch) | |
| tree | dd20881a5a396a78cafd3b1bdee4c52e329efd0d | |
| parent | 117b28680e56e10aac6c6489ba77963e7e8abd18 (diff) | |
| download | ceph-ed4f80f960b535d061dea782eb0799ce55f9463a.tar.gz | |
vstart: use absolute path for keyring
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>
| -rwxr-xr-x | src/vstart.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vstart.sh b/src/vstart.sh index 1a5cf68349e..f6dece36e1b 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -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 |