From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 80DB078803
for <pve-devel@lists.proxmox.com>; Fri, 30 Apr 2021 15:55:15 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id AB07F974E
for <pve-devel@lists.proxmox.com>; Fri, 30 Apr 2021 15:54:44 +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 0940996D1
for <pve-devel@lists.proxmox.com>; 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 BFB55464FC
for <pve-devel@lists.proxmox.com>; Fri, 30 Apr 2021 15:54:41 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 30 Apr 2021 15:54:33 +0200
Message-Id: <20210430135437.4816-2-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 1/5] api: ceph: mon: split up arguments
for run_command
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 30 Apr 2021 13:55:15 -0000
no functional change is intended.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/API2/Ceph/MON.pm | 46 +++++++++++++++++++++++++++++++++++++-------
1 file changed, 39 insertions(+), 7 deletions(-)
diff --git a/PVE/API2/Ceph/MON.pm b/PVE/API2/Ceph/MON.pm
index 19ba5e50..8f2d5bc4 100644
--- a/PVE/API2/Ceph/MON.pm
+++ b/PVE/API2/Ceph/MON.pm
@@ -229,9 +229,23 @@ __PACKAGE__->register_method ({
if (! -f $mon_keyring) {
print "creating new monitor keyring\n";
- run_command("ceph-authtool --create-keyring $mon_keyring ".
- " --gen-key -n mon. --cap mon 'allow *'");
- run_command("ceph-authtool $mon_keyring --import-keyring $client_keyring");
+ run_command([
+ 'ceph-authtool',
+ '--create-keyring',
+ $mon_keyring,
+ '--gen-key',
+ '-n',
+ 'mon.',
+ '--cap',
+ 'mon',
+ 'allow *',
+ ]);
+ run_command([
+ 'ceph-authtool',
+ $mon_keyring,
+ '--import-keyring',
+ $client_keyring,
+ ]);
}
my $ccname = PVE::Ceph::Tools::get_config('ccname');
@@ -243,7 +257,7 @@ __PACKAGE__->register_method ({
eval {
mkdir $mondir;
- run_command("chown ceph:ceph $mondir");
+ run_command(['chown', 'ceph:ceph', $mondir]);
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' });
@@ -255,11 +269,29 @@ __PACKAGE__->register_method ({
$cfg->{global}->{ms_bind_ipv6} = 'true';
$cfg->{global}->{ms_bind_ipv4} = 'false';
}
- run_command("monmaptool --create --clobber --addv $monid '[v2:$monaddr:3300,v1:$monaddr:6789]' --print $monmap");
+ run_command([
+ 'monmaptool',
+ '--create',
+ '--clobber',
+ '--addv',
+ $monid,
+ "[v2:$monaddr:3300,v1:$monaddr:6789]",
+ '--print',
+ $monmap,
+ ]);
}
- run_command("ceph-mon --mkfs -i $monid --monmap $monmap --keyring $mon_keyring");
- run_command("chown ceph:ceph -R $mondir");
+ run_command([
+ 'ceph-mon',
+ '--mkfs',
+ '-i',
+ $monid,
+ '--monmap',
+ $monmap,
+ '--keyring',
+ $mon_keyring,
+ ]);
+ run_command(['chown', 'ceph:ceph', '-R', $mondir]);
};
my $err = $@;
unlink $monmap;
--
2.20.1