From: Danny Kukawka Date: Thu, 16 Aug 2012 10:56:58 +0000 (+0200) Subject: fix keyring generation for mds and osd X-Git-Tag: v0.51~16 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a15fde495fc930363ce22a818e83b1363e1aa9f4;p=ceph.git fix keyring generation for mds and osd [ The following text is in the "UTF-8" character set. ] [ Your display is set for the "ANSI_X3.4-1968" character set. ] [ Some characters may be displayed incorrectly. ] Fix config keys for OSD/MDS data dirs. As in documentation and other places of the scripts the keys are 'osd data'/'mds data' and not 'osd_data' In case if MDS: if 'mds data' doesn't exist, create it. Signed-off-by: Danny Kukawka --- diff --git a/src/mkcephfs.in b/src/mkcephfs.in index 45e48f76deeb..aae616c68a03 100644 --- a/src/mkcephfs.in +++ b/src/mkcephfs.in @@ -251,14 +251,15 @@ if [ -n "$initdaemon" ]; then if [ $type = "osd" ]; then $BINDIR/ceph-osd -c $conf --monmap $dir/monmap -i $id --mkfs --mkkey - get_conf osd_data "/var/lib/ceph/osd/ceph-$id" "osd_data" + get_conf osd_data "/var/lib/ceph/osd/ceph-$id" "osd data" get_conf osd_keyring "$osd_data/keyring" "keyring" $BINDIR/ceph-authtool -p -n $name $osd_keyring > $dir/key.$name fi if [ $type = "mds" ]; then - get_conf mds_data "/var/lib/ceph/mds/ceph-$id" "mds_data" + get_conf mds_data "/var/lib/ceph/mds/ceph-$id" "mds data" get_conf mds_keyring "$mds_data/keyring" "keyring" + test -d $mds_data || mkdir -p $mds_data echo "creating private key for $name keyring $mds_keyring" $BINDIR/ceph-authtool --create-keyring --gen-key -n $name $mds_keyring $BINDIR/ceph-authtool -p -n $name $mds_keyring > $dir/key.$name