yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CephConfig: read monitor addresses also from mon_host for cephfs

Browse Source 
since we write only the mon_host config beginning with nautilus,
we have to get the monitor ips from there as well

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2019-06-27 10:43:12 +02:00
committed by Thomas Lamprecht
parent c8a3234574
commit 5b79dac99b
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/CephConfig.pm
View File

@ -121,10 +121,31 @@ sub get_monaddr_list {
my $config = $parse_ceph_file->($configfile);
my @monids = grep { /mon\./ && defined($config->{$_}->{'mon addr'}) } %{$config};
my $monhostlist = {};
return join(',', sort map { $config->{$_}->{'mon addr'} } @monids);
};
# get all ip adresses from mon_host
my $monhosts = [ split (/[ ,;]+/, $config->{global}->{mon_host} // "") ];
foreach my $monhost (@$monhosts) {
$monhost =~ s/^\[?v\d\://; # remove beginning of vector
$monhost =~ s|/\d+\]?||; # remove end of vector
my $host = $get_host->($monhost);
if ($host ne "") {
$monhostlist->{$host} = 1;
}
}
# then get all addrs from mon. sections
for my $section ( keys %$config ) {
next if $section !~ m/^mon\./;
if (my $addr = $config->{$section}->{mon_addr}) {
$monhostlist->{$addr} = 1;
}
}
return join(',', sort keys %$monhostlist);
}
sub hostlist {
my ($list_text, $separator) = @_;