vstart: add [mds.a] section when no -x

diff --git a/src/vstart.sh b/src/vstart.sh
index d211ac5830d8e70c6abff971e0cbc4bffa22358c..fc4282fdae8d5fc50e50609baa460fd1b950c495 100755 (executable)
--- 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