From 03b0546fecded2f221e0727a2c9c30688c21a79d Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 14 Apr 2022 12:34:47 -0600 Subject: [PATCH] osd: enable quincy osd release version After all OSDs are updated to each major release of Ceph, the require-osd-release version is set to that release so all the latest functionality for osds can be enabled by Ceph. In Quincy there is a warning if all osds are on Quincy and this flag is not set, so this will resolve the health warning. Signed-off-by: Travis Nielsen --- pkg/operator/ceph/cluster/osd/osd.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/operator/ceph/cluster/osd/osd.go b/pkg/operator/ceph/cluster/osd/osd.go index b9a9a008011d..0ae874f8412d 100644 --- a/pkg/operator/ceph/cluster/osd/osd.go +++ b/pkg/operator/ceph/cluster/osd/osd.go @@ -735,13 +735,13 @@ func (c *Cluster) applyUpgradeOSDFunctionality() { logger.Warningf("failed to extract ceph version. %v", err) return } - // if the version of these OSDs is Octopus then we run the command - if osdVersion.IsOctopus() { - err = cephclient.EnableReleaseOSDFunctionality(c.context, c.clusterInfo, "octopus") - if err != nil { - logger.Warningf("failed to enable new osd functionality. %v", err) - return - } + // Ensure the required version of OSDs is set to the current consistent version, + // enabling the latest osd functionality and also preventing downgrades to a + // previous major ceph version. + err = cephclient.EnableReleaseOSDFunctionality(c.context, c.clusterInfo, osdVersion.ReleaseName()) + if err != nil { + logger.Warningf("failed to enable new osd functionality. %v", err) + return } } }