From 35e1ff5cf4a50594578ab8d13499789c2ccef351 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Tue, 30 Mar 2021 09:55:18 -0400 Subject: [PATCH] Set RBD default features based on distro In some jobs, we run tests that use "rbd map". On older kernels, this will not work if newer RBD features are used. (Specifically, fast-diff on bionic.) On older distros, enable fewer features by default. Closes-Bug: #1921897 Change-Id: Iff1c5210b0279379eb9612b206bdf456dd6f132e --- devstack/lib/ceph | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ceph b/devstack/lib/ceph index ba96bc0..5bdbddd 100755 --- a/devstack/lib/ceph +++ b/devstack/lib/ceph @@ -57,7 +57,11 @@ MDS_ID=${MDS_ID:-a} MGR_ID=${MGR_ID:-x} # RBD configuration defaults -CEPH_RBD_DEFAULT_FEATURES=${CEPH_RBD_DEFAULT_FEATURES:-"layering, exclusive-lock, object-map, fast-diff"} +if [[ ${DISTRO} =~ (bionic|xenial) ]]; then + CEPH_RBD_DEFAULT_FEATURES=${CEPH_RBD_DEFAULT_FEATURES:-"layering, exclusive-lock"} +else + CEPH_RBD_DEFAULT_FEATURES=${CEPH_RBD_DEFAULT_FEATURES:-"layering, exclusive-lock, object-map, fast-diff"} +fi # Glance GLANCE_CEPH_USER=${GLANCE_CEPH_USER:-glance}