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{