summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-12-01 10:50:47 -0800
committerSage Weil <sage@newdream.net>2009-12-01 12:07:07 -0800
commit8dd0991ea564b746a902071c287917deaf29f336 (patch)
tree0ab8e6a9b42a383f5428a75b9fbd09b638ed3a46
parent75d4ce8908f5145acab1638fc55ba8b3de24ddba (diff)
downloadceph-8dd0991ea564b746a902071c287917deaf29f336.tar.gz
vstart: add [mds.a] section when no -x
-rwxr-xr-xsrc/vstart.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/vstart.sh b/src/vstart.sh
index d211ac5830d..fc4282fdae8 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -352,17 +352,21 @@ if [ "$start_mds" -eq 1 ]; then
do
if [ "$new" -eq 1 ]; then
key_fn=dev/mds.$name.keyring
- if [ "$cephx" -eq 1 ] && [ $overwrite_conf -eq 1 ]; then
+ if [ $overwrite_conf -eq 1 ]; then
cat <<EOF >> $conf
[mds.$name]
+EOF
+ if [ "$cephx" -eq 1 ]; then
+ cat <<EOF >> $conf
keys file = $key_fn
EOF
- cat <<EOF > $mds_caps
+ cat <<EOF > $mds_caps
; generated by vstart.sh on `date`
mon = "allow rwx"
osd = "allow rwx"
mds = "allow"
EOF
+ fi
fi
$SUDO $CEPH_BIN/authtool --gen-key --name=mds.$name --caps=$mds_caps $key_fn
$SUDO $CEPH_ADM -i $key_fn auth add mds.$name