Set rbd default features in ceph.conf
The typical Cinder deployment should have more than just "layering" enabled. Enable fast-diff, which requires exclusive-lock and object-map. Previously, there was code that tried to enable exclusive-lock when CEPH_ISCSI is enabled, but this code would not work reliably, since it was doing addition instead of bitwise-or. Just remove it since exclusive-lock will be enabled by default. Change-Id: Idad98cfebf5e3b265316f2b6a3c201b472faa32c
This commit is contained in:
parent
57b5ab1520
commit
467b4295f2
@ -59,7 +59,7 @@ MDS_ID=${MDS_ID:-a}
|
|||||||
MGR_ID=${MGR_ID:-x}
|
MGR_ID=${MGR_ID:-x}
|
||||||
|
|
||||||
# RBD configuration defaults
|
# RBD configuration defaults
|
||||||
CEPH_RBD_DEFAULT_FEATURES=${CEPH_RBD_DEFAULT_FEATURES:-1}
|
CEPH_RBD_DEFAULT_FEATURES=${CEPH_RBD_DEFAULT_FEATURES:-"layering, exclusive-lock, object-map, fast-diff"}
|
||||||
|
|
||||||
# Glance
|
# Glance
|
||||||
GLANCE_CEPH_USER=${GLANCE_CEPH_USER:-glance}
|
GLANCE_CEPH_USER=${GLANCE_CEPH_USER:-glance}
|
||||||
@ -406,12 +406,6 @@ function configure_ceph {
|
|||||||
|
|
||||||
sudo mkdir -p ${CEPH_DATA_DIR}/mon/ceph-$(hostname)
|
sudo mkdir -p ${CEPH_DATA_DIR}/mon/ceph-$(hostname)
|
||||||
|
|
||||||
if [ "$ENABLE_CEPH_ISCSI" = "True" ]; then
|
|
||||||
# exclusive locks must be enabled by default
|
|
||||||
# for images being exported for ceph iscsi
|
|
||||||
CEPH_RBD_DEFAULT_FEATURES=$(($CEPH_RBD_DEFAULT_FEATURES + 4))
|
|
||||||
fi
|
|
||||||
|
|
||||||
# create a default ceph configuration file
|
# create a default ceph configuration file
|
||||||
iniset -sudo ${CEPH_CONF_FILE} global "fsid" "${CEPH_FSID}"
|
iniset -sudo ${CEPH_CONF_FILE} global "fsid" "${CEPH_FSID}"
|
||||||
iniset -sudo ${CEPH_CONF_FILE} global "mon_initial_members" "$(hostname)"
|
iniset -sudo ${CEPH_CONF_FILE} global "mon_initial_members" "$(hostname)"
|
||||||
|
Loading…
Reference in New Issue
Block a user