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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id AA0A478763 for ; Fri, 30 Apr 2021 15:54:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9CCD69709 for ; Fri, 30 Apr 2021 15:54:43 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 060C196D0 for ; Fri, 30 Apr 2021 15:54:41 +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 C7D69464FE for ; Fri, 30 Apr 2021 15:54:41 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 30 Apr 2021 15:54:35 +0200 Message-Id: <20210430135437.4816-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210430135437.4816-1-f.ebner@proxmox.com> References: <20210430135437.4816-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mon.pm] Subject: [pve-devel] [RFC manager 3/5] api: ceph: create mon: factor out monmaptool command 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: Fri, 30 Apr 2021 13:54:43 -0000 so it's easier to re-use for a future variant. Signed-off-by: Fabian Ebner --- PVE/API2/Ceph/MON.pm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm index 618d3f06..0f9b30ba 100644 --- a/PVE/API2/Ceph/MON.pm +++ b/PVE/API2/Ceph/MON.pm @@ -268,24 +268,24 @@ __PACKAGE__->register_method ({ $cfg->{global}->{ms_bind_ipv6} = 'false' if $is_first_address; } + my $monaddr = Net::IP::ip_is_ipv6($ip) ? "[$ip]" : $ip; + + my $monmaptool_cmd = [ + 'monmaptool', + '--create', + '--clobber', + '--addv', + $monid, + "[v2:$monaddr:3300,v1:$monaddr:6789]", + '--print', + $monmap, + ]; + if (defined($rados)) { # we can only have a RADOS object if we have a monitor my $mapdata = $rados->mon_command({ prefix => 'mon getmap', format => 'plain' }); file_set_contents($monmap, $mapdata); } else { # we need to create a monmap for the first monitor - my $monaddr = $ip; - if (Net::IP::ip_is_ipv6($ip)) { - $monaddr = "[$ip]"; - } - run_command([ - 'monmaptool', - '--create', - '--clobber', - '--addv', - $monid, - "[v2:$monaddr:3300,v1:$monaddr:6789]", - '--print', - $monmap, - ]); + run_command($monmaptool_cmd); } run_command([ -- 2.20.1