From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Tue, 6 Jul 2021 12:13:47 +0000 (+0200)
Subject: pve6to7: dont guard noout check on Ceph version
X-Git-Url: https://git.proxmox.com/?p=pve-manager.git;a=commitdiff_plain;h=6d451a4bc3d4c08bc70e5ba25ddb92a84d0bbd07

pve6to7: dont guard noout check on Ceph version

we don't have a mandatory Ceph major version upgrade this time around,
so this check does not make sense. instead, we want noout until the full
cluster is upgraded. let's use the simple approach and just flip the
switch to "turn off noout if all of Ceph is a single version" in the PVE
7.x branch.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index 7793465f..629d6935 100644
--- a/PVE/CLI/pve6to7.pm
+++ b/PVE/CLI/pve6to7.pm
@@ -450,9 +450,7 @@ sub check_ceph {
 	    log_warn("unable to determine overall Ceph daemon versions!");
 	} elsif (keys %$overall_versions == 1) {
 	    log_pass("single running overall version detected for all Ceph daemon types.");
-	    if ((keys %$overall_versions)[0] =~ /^ceph version 15\./) {
-		$noout_wanted = 0;
-	    }
+	    $noout_wanted = 0; # off post-upgrade, on pre-upgrade
 	} else {
 	    log_warn("overall version mismatch detected, check 'ceph versions' output for details!");
 	}