Merge "Set rbd default features in ceph.conf"

Code Issues Proposed changes

This commit is contained in:

Zuul

2021年03月16日 22:42:06 +00:00

committed by Gerrit Code Review

parent 6e6c81bc57 467b4295f2

commit 59bef674f5

1 changed files with 1 additions and 7 deletions

@@ -57,7 +57,7 @@ MDS_ID=${MDS_ID:-a}

MGR_ID=${MGR_ID:-x}

# 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_CEPH_USER=${GLANCE_CEPH_USER:-glance}

@@ -404,12 +404,6 @@ function configure_ceph {

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

iniset -sudo ${CEPH_CONF_FILE} global "fsid" "${CEPH_FSID}"

iniset -sudo ${CEPH_CONF_FILE} global "mon_initial_members" "$(hostname)"