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

5to6: ceph mon host check: switch config check from defined to hash values exist

Browse Source 
we can get here if a empty (or one with just comments) ceph.conf
exists

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-07-04 10:31:06 +02:00
parent 780a57b6d1
commit f9f8cd7d01
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/CLI/pve5to6.pm
View File

@ -433,7 +433,7 @@ sub check_ceph {
log_info("checking Ceph config.."); log_info("checking Ceph config..");
my $conf = PVE::Cluster::cfs_read_file('ceph.conf'); my $conf = PVE::Cluster::cfs_read_file('ceph.conf');
if (defined($conf)) { if (%$conf) {
my $global = $conf->{global}; my $global = $conf->{global};
my $global_monhost = $global->{mon_host} // $global->{"mon host"} // $global->{"mon-host"}; my $global_monhost = $global->{mon_host} // $global->{"mon host"} // $global->{"mon-host"};
@ -454,7 +454,7 @@ sub check_ceph {
log_pass("ms_bind_ipv6 not enabled"); log_pass("ms_bind_ipv6 not enabled");
} }
} else { } else {
log_skip("no ceph config found"); log_warn("Empty ceph config found");
} }
my $local_ceph_ver = PVE::Ceph::Tools::get_local_version(1); my $local_ceph_ver = PVE::Ceph::Tools::get_local_version(1);