osd: update existing OSDs with deviceClass

If we apply useAllNodes to false for the current deployment,
the OSDs should get updated with the individual nodes values and config,
The deviceClass was not updating to the existing OSDs because there was
bug in the check.
The check osdInfo.DeviceClass == "" which should be
checked like this osdInfo.DeviceClass == "None"

Updated the code so OSDs can make use of the devices present

Signed-off-by: parth-gr <paarora@redhat.com>

pkg/daemon/ceph/client/osd.go

@@ -310,7 +310,7 @@ func OsdListNum(context *clusterd.Context, clusterInfo *ClusterInfo) (OsdList, e
 // OSDDeviceClass report device class for osd
 type OSDDeviceClass struct {
 	ID          int    `json:"osd"`
-	DeviceClass string `json:"device_class"`
+	DeviceClass string `json:"device_class,omitempty"`
 }
 
 // OSDDeviceClasses returns the device classes for particular OsdIDs

pkg/operator/ceph/cluster/osd/osd.go

@@ -96,7 +96,7 @@ type OSDInfo struct {
 	Cluster        string `json:"cluster"`
 	UUID           string `json:"uuid"`
 	DevicePartUUID string `json:"device-part-uuid"`
-	DeviceClass    string `json:"device-class"`
+	DeviceClass    string `json:"device-class,omitempty"`
 	// BlockPath is the logical Volume path for an OSD created by Ceph-volume with format '/dev/<Volume Group>/<Logical Volume>' or simply /dev/vdb if block mode is used
 	BlockPath     string `json:"lv-path"`
 	MetadataPath  string `json:"metadata-path"`

pkg/operator/ceph/cluster/osd/update.go

@@ -126,7 +126,8 @@ func (c *updateConfig) updateExistingOSDs(errs *provisionErrors) {
 		}
 
 		// backward compatibility for old deployments
-		if osdInfo.DeviceClass == "" {
+		// Checking DeviceClass with None too, because ceph architecture return crush device class as None
+		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)