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

CephConfig: refactor host port parsing

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

18
PVE/CephConfig.pm
View File

@ -100,6 +100,17 @@ my $ceph_get_key = sub {
return $secret; return $secret;
}; };
my $get_host = sub {
my ($hostport) = @_;
my ($host, $port) = PVE::Tools::parse_host_and_port($hostport);
if (!defined($host)) {
return "";
}
$port = defined($port) ? ":$port" : '';
$host = "[$host]" if Net::IP::ip_is_ipv6($host);
return "${host}${port}";
};
sub get_monaddr_list { sub get_monaddr_list {
my ($configfile) = shift; my ($configfile) = shift;
@ -119,12 +130,7 @@ sub hostlist {
my ($list_text, $separator) = @_; my ($list_text, $separator) = @_;
my @monhostlist = PVE::Tools::split_list($list_text); my @monhostlist = PVE::Tools::split_list($list_text);
return join($separator, map { return join($separator, map { $get_host->($_) } @monhostlist);
my ($host, $port) = PVE::Tools::parse_host_and_port($_);
$port = defined($port) ? ":$port" : '';
$host = "[$host]" if Net::IP::ip_is_ipv6($host);
"${host}${port}"
} @monhostlist);
} }
my $ceph_check_keyfile = sub { my $ceph_check_keyfile = sub {