diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2012-05-31 11:38:37 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2012-05-31 11:38:37 -0700 |
| commit | 8609caffd9dfa825a5896687b6977afa1be48ae5 (patch) | |
| tree | 9675fa6db49c4b0a7bfcbce721987f1e2e6083f2 /src/vstart.sh | |
| parent | e929d54da3a91b57bd564d0c6861f4a6a55460e4 (diff) | |
| download | ceph-8609caffd9dfa825a5896687b6977afa1be48ae5.tar.gz | |
vstart.sh: initialize keyring even if not using cephx
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'src/vstart.sh')
| -rwxr-xr-x | src/vstart.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/vstart.sh b/src/vstart.sh index 5e39c7cb011..ccd7eb032c1 100755 --- 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 |