vstart.sh: initialize keyring even if not using cephx

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/vstart.sh b/src/vstart.sh
index 5e39c7cb011c2af9ff95ccb2676ba6b324373073..ccd7eb032c1d720c8550f4c07fb7f287f178b9d5 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -298,8 +298,8 @@ EOF
                        echo
                fi
 
-               [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/ceph-authtool --create-keyring --gen-key --name=mon. $keyring_fn
-               [ "$cephx" -eq 1 ] && $SUDO $CEPH_BIN/ceph-authtool --gen-key --name=client.admin --set-uid=0 \
+               $SUDO $CEPH_BIN/ceph-authtool --create-keyring --gen-key --name=mon. $keyring_fn
+               $SUDO $CEPH_BIN/ceph-authtool --gen-key --name=client.admin --set-uid=0 \
                    --cap mon 'allow *' \
                    --cap osd 'allow *' \
                    --cap mds allow \
@@ -372,11 +372,9 @@ EOF
            $SUDO $CEPH_ADM osd crush set $osd osd.$osd 1.0 host=localhost rack=localrack pool=default
            $SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS --mkfs --mkkey --osd-uuid $uuid
 
-           if [ "$cephx" -eq 1 ]; then
-               key_fn=dev/osd$osd/keyring
-               echo adding osd$osd key to auth repository
-               $SUDO $CEPH_ADM -i $key_fn auth add osd.$osd osd "allow *" mon "allow rwx"
-           fi
+           key_fn=dev/osd$osd/keyring
+           echo adding osd$osd key to auth repository
+           $SUDO $CEPH_ADM -i $key_fn auth add osd.$osd osd "allow *" mon "allow rwx"
        fi
        echo start osd$osd
        run 'osd' $SUDO $CEPH_BIN/ceph-osd -i $osd $ARGS $COSD_ARGS