Merge pull request #9271 from rook/mergify/bp/release-1.7/pr-9259

osd: update existing OSDs with deviceClass (backport #9259)
rook · Nov 29, 2021 · a9cda1e · a9cda1e
2 parents cf2b787 + cb6f87e
commit a9cda1e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/operator/ceph/cluster/osd/update.go b/pkg/operator/ceph/cluster/osd/update.go
@@ -129,7 +129,9 @@ func (c *updateConfig) updateExistingOSDs(errs *provisionErrors) {
 		}
 
 		// backward compatibility for old deployments
-		if osdInfo.DeviceClass == "" {
+		// Checking DeviceClass with None too, because ceph-volume lvm list return crush device class as None
+		// Tracker https://tracker.ceph.com/issues/53425
+		if osdInfo.DeviceClass == "" || osdInfo.DeviceClass == "None" {
 			deviceClassInfo, err := cephclient.OSDDeviceClasses(c.cluster.context, c.cluster.clusterInfo, []string{strconv.Itoa(osdID)})
 			if err != nil {
 				logger.Errorf("failed to get device class for existing deployment %q. %v", depName, err)