proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-27 05:52:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pve5to6: check for ceph-volume osds

Browse Source 
do not warn in case there exist nautilus osds
since the upgrade has to be done by the time a user should add new
osds, it does not make sense to warn in that case

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-07-15 10:20:27 +02:00 committed by Thomas Lamprecht
parent 994f647edc
commit 8be1b3ba95
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/CLI/pve5to6.pm
View File

@ -561,8 +561,9 @@ 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)) {
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).");
}
}