summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Mick <dan.mick@inktank.com>2012-11-13 13:24:15 -0800
committerDan Mick <dan.mick@inktank.com>2012-11-13 15:12:16 -0800
commit65961ca23b39f9928d28de0c13fe47437f935f61 (patch)
tree9e42a03ffa98c7826eebf9d5a0efa45e29034eb2
parent1679a55662a74db0bfd7e4c0b370ec9f8a32c485 (diff)
downloadceph-65961ca23b39f9928d28de0c13fe47437f935f61.tar.gz
vstart.sh: support -X by adding 'auth required = none' entries
Signed-off-by: Dan Mick <dan.mick@inktank.com>
-rwxr-xr-xsrc/vstart.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/vstart.sh b/src/vstart.sh
index bdf02f3b88e..e0516341e10 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -292,9 +292,17 @@ if [ "$start_mon" -eq 1 ]; then
osd pgp bits = 5 ; (invalid, but ceph should cope!)
osd pool default min size = 1
EOF
- [ "$cephx" -eq 1 ] && cat<<EOF >> $conf
+if [ "$cephx" -eq 1 ] ; then
+cat <<EOF >> $conf
auth supported = cephx
EOF
+else
+cat <<EOF >> $conf
+ auth cluster required = none
+ auth service required = none
+ auth client required = none
+EOF
+fi
cat <<EOF >> $conf
[client]