From f482b1ceba272a8638aa809458ce08a02e72dd88 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 17 Feb 2022 15:51:55 +0530 Subject: [PATCH] core: remove rbd_default_features setting Instead of setting the default values in the Rook we should use the defaults provided by the ceph it self. This configuration is causing problem for the rbd image creation, this is not allowing the rbd images to have default image features which comes with librbd. Signed-off-by: Madhu Rajanna --- pkg/operator/ceph/config/config.go | 4 ---- pkg/operator/ceph/config/defaults.go | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/pkg/operator/ceph/config/config.go b/pkg/operator/ceph/config/config.go index e3c54f9fc..14de2a231 100644 --- a/pkg/operator/ceph/config/config.go +++ b/pkg/operator/ceph/config/config.go @@ -138,10 +138,6 @@ func SetOrRemoveDefaultConfigs( } } - if err := monStore.SetAll(DefaultLegacyConfigs()...); err != nil { - return errors.Wrapf(err, "failed to apply legacy config overrides") - } - // Apply Multus if needed if clusterSpec.Network.IsMultus() { logger.Info("configuring ceph network(s) with multus") diff --git a/pkg/operator/ceph/config/defaults.go b/pkg/operator/ceph/config/defaults.go index 5bee70696..3883a8e07 100644 --- a/pkg/operator/ceph/config/defaults.go +++ b/pkg/operator/ceph/config/defaults.go @@ -80,16 +80,6 @@ func DefaultCentralizedConfigs(cephVersion version.CephVersion) []Option { return overrides } -// DefaultLegacyConfigs need to be added to the Ceph config file until the integration tests can be -// made to override these options for the Ceph clusters it creates. -func DefaultLegacyConfigs() []Option { - overrides := []Option{ - // TODO: move this under LegacyConfigs() when FlexVolume is no longer supported - configOverride("global", "rbd_default_features", "3"), - } - return overrides -} - // LegacyConfigs represents old configuration that were applied to a cluster and not needed anymore func LegacyConfigs() []Option { return []Option{