From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0D60A7ABEA for ; Mon, 10 May 2021 14:18:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B658317CB1 for ; Mon, 10 May 2021 14:18:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id DEB8E17C57 for ; Mon, 10 May 2021 14:18:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AC15D46351 for ; Mon, 10 May 2021 14:18:31 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 10 May 2021 14:18:22 +0200 Message-Id: <20210510121826.8543-11-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210510121826.8543-1-f.ebner@proxmox.com> References: <20210510121826.8543-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.002 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v2 manager 10/14] api: ceph: mon: add ips_from_mon_host helper X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 May 2021 12:18:35 -0000 Partially based on pve-storage's CephConfig.pm get_monaddr_list, but the interface is not the best for the use case here. Signed-off-by: Fabian Ebner --- New in v2. PVE/API2/Ceph/MON.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm index f7af3c37..e4e8ecfb 100644 --- a/PVE/API2/Ceph/MON.pm +++ b/PVE/API2/Ceph/MON.pm @@ -62,6 +62,30 @@ my $find_mon_ip = sub { } }; +my $ips_from_mon_host = sub { + my ($mon_host) = @_; + + my $ips = []; + + my @hosts = PVE::Tools::split_list($mon_host); + + for my $host (@hosts) { + $host =~ s|^\[?v\d+\:||; # remove beginning of vector + $host =~ s|/\d+\]?||; # remove end of vector + + ($host) = PVE::Tools::parse_host_and_port($host); + next if !defined($host); + + # filter out hostnames + my $ip = PVE::JSONSchema::pve_verify_ip($host, 1); + next if !defined($ip); + + push @{$ips}, $ip; + } + + return $ips; +}; + my $assert_mon_prerequisites = sub { my ($cfg, $monhash, $monid, $monip) = @_; -- 2.20.1