Merge pull request #10445 from leseb/do-not-fail-ondeactivate-failure

osd: add lvm flag for lvm osd activate

pkg/daemon/ceph/osd/daemon.go

@@ -71,7 +71,6 @@ func StartOSD(context *clusterd.Context, osdType, osdID, osdUUID, lvPath string,
 		// It's fine to continue if deactivate fails since we will return error if activate fails
 		if op, err := context.Executor.ExecuteCommandWithCombinedOutput("vgchange", "-an", "-vv", volumeGroupName); err != nil {
 			logger.Errorf("failed to deactivate volume group for lv %q. output: %s. %v", lvPath, op, err)
-			return nil
 		}
 
 		if op, err := context.Executor.ExecuteCommandWithCombinedOutput("vgchange", "-ay", "-vv", volumeGroupName); err != nil {

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

@@ -372,6 +372,7 @@ func (c *Cluster) makeDeployment(osdProps osdProperties, osd OSDInfo, provisionC
 			"--setgroup", "ceph",
 			fmt.Sprintf("--crush-location=%s", osd.Location),
 		}
+		osd.LVBackedPV = true
 	} else if osdProps.onPVC() && osd.CVMode == "raw" {
 		doBinaryCopyInit = false
 		doConfigInit = false