The previous fix (
0f7c516f3e) breaks osd startup with -k. This one
from dmick just tells the ceph-mon which keyring to use through the
command line rather than moving the keyring path to the [global]
section of the config file.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
auth supported = cephx
EOF
cat <<EOF >> $conf
- keyring = $keyring_fn
[client]
+ keyring = $keyring_fn
[mds]
$DAEMONOPTS
echo $cmd
$cmd
cmd="$CEPH_BIN/ceph-mon --mkfs -c $conf -i $f --monmap=$monmap_fn"
- [ "$cephx" -eq 1 ] && cmd="$cmd --keyring=$keyring_fn"
+ cmd="$cmd --keyring=$keyring_fn"
echo $cmd
$cmd
done