From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 3/5] pve6to7: check for >= Octopus
Date: Tue, 6 Jul 2021 14:13:46 +0200 [thread overview]
Message-ID: <20210706121348.3505015-4-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20210706121348.3505015-1-f.gruenbichler@proxmox.com>
and drop the Nautilus OSD upgrade check while we are at it..
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
PVE/CLI/pve6to7.pm | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index 65ee5a66..00f922bb 100644
--- a/PVE/CLI/pve6to7.pm
+++ b/PVE/CLI/pve6to7.pm
@@ -493,12 +493,8 @@ sub check_ceph {
my $local_ceph_ver = PVE::Ceph::Tools::get_local_version(1);
if (defined($local_ceph_ver)) {
- if ($local_ceph_ver == 14) {
- my $ceph_volume_osds = PVE::Ceph::Tools::ceph_volume_list();
- my $scanned_osds = PVE::Tools::dir_glob_regex('/etc/ceph/osd', '^.*\.json$');
- if (-e '/var/lib/ceph/osd/' && !defined($scanned_osds) && !(keys %$ceph_volume_osds)) {
- log_warn("local Ceph version is Nautilus, local OSDs detected, but no conversion from ceph-disk to ceph-volume done (yet).");
- }
+ if ($local_ceph_ver <= 14) {
+ log_fail("local Ceph version too low, at least Octopus required..");
}
} else {
log_fail("unable to determine local Ceph version.");
--
2.30.2
next prev parent reply other threads:[~2021-07-06 12:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 12:13 [pve-devel] [PATCH manager 0/5] pve6to7 ceph fixes Fabian Grünbichler
2021-07-06 12:13 ` [pve-devel] [PATCH manager 1/5] pve6to7: use new flags API Fabian Grünbichler
2021-07-06 12:13 ` [pve-devel] [PATCH manager 2/5] pve6to7: remove PASS noise for ceph Fabian Grünbichler
2021-07-06 12:13 ` Fabian Grünbichler [this message]
2021-07-06 12:13 ` [pve-devel] [PATCH manager 4/5] pve6to7: dont guard noout check on Ceph version Fabian Grünbichler
2021-07-06 12:13 ` [pve-devel] [PATCH stable-6 manager 5/5] pve6to7: enable noout before upgrade Fabian Grünbichler
2021-07-06 12:53 ` [pve-devel] applied-series: [PATCH manager 0/5] pve6to7 ceph fixes Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210706121348.3505015-4-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox