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>
(cherry picked from commit 5617b13b915e79c582de5d2c9f8d8d814e79559a)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index c26c3d5a90fe78e1ba6247452c89dd806f91686b..3e5af2c3dcae199320336ee2388923a9330ed8cc 100644 (file)
--- 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!");
        }