diff mbox

vstart: use absolute path for keyring

Message ID EAE9FF3D-13E6-46CB-8D2F-31AE0C1D583A@cs.ucsc.edu (mailing list archive)
State New, archived
Headers show

Commit Message

Noah Watkins July 14, 2012, 12:01 a.m. UTC 
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.
---
 src/vstart.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Tommi Virtanen July 14, 2012, 12:12 a.m. UTC | #1 
On Fri, Jul 13, 2012 at 5:01 PM, Noah Watkins <jayhawk@cs.ucsc.edu> wrote:
> 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.

Perhaps relative paths in ceph.conf should be interpreted as relative
to the config file? That's a fairly standard convention in other
software..
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Noah Watkins July 14, 2012, 12:15 a.m. UTC | #2 
Ok good point. I know where the config is cause I ran ./vstart :)

On Fri, Jul 13, 2012 at 5:12 PM, Tommi Virtanen <tv@inktank.com> wrote:
> On Fri, Jul 13, 2012 at 5:01 PM, Noah Watkins <jayhawk@cs.ucsc.edu> wrote:
>> 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.
>
> Perhaps relative paths in ceph.conf should be interpreted as relative
> to the config file? That's a fairly standard convention in other
> software..
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sage Weil July 14, 2012, 12:28 a.m. UTC | #3 
On Fri, 13 Jul 2012, Tommi Virtanen wrote:
> On Fri, Jul 13, 2012 at 5:01 PM, Noah Watkins <jayhawk@cs.ucsc.edu> wrote:
> > 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.
> 
> Perhaps relative paths in ceph.conf should be interpreted as relative
> to the config file? That's a fairly standard convention in other
> software..

Good idea.  That'll mean some changes in teh config code.  ..

In the meantime, I'll apply this!

sag
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/vstart.sh b/src/vstart.sh
index 1a5cf68..f6dece3 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