From b4946aba95cc24488e14df834d309f5f824d6d62 Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Tue, 20 Apr 2021 12:45:05 -0600 Subject: [PATCH] ceph: use ceph-volume v2 report format for Pacific This fixes cases where raw provisioning mode still cannot be used for Rook v1.6 and Ceph Pacific clusters where json.Unmarshal fails to read the ceph-volume output after OSD provisioning. Signed-off-by: Blaine Gardner --- pkg/daemon/ceph/osd/volume.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/daemon/ceph/osd/volume.go b/pkg/daemon/ceph/osd/volume.go index bc464047d..4e4508b87 100644 --- a/pkg/daemon/ceph/osd/volume.go +++ b/pkg/daemon/ceph/osd/volume.go @@ -111,6 +111,10 @@ func isNewStyledLvmBatch(version cephver.CephVersion) bool { return true } + if version.IsAtLeastPacific() { + return true + } + return false }