proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-15 11:17:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: ceph: mon: split up arguments for run_command

Browse Source 
no functional change is intended.

Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>
Tested-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2021-05-10 14:18:17 +02:00 committed by Thomas Lamprecht
parent aa16ebbb97
commit 6e96b07078
1 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
PVE/API2/Ceph/MON.pm
View File

@ -229,9 +229,23 @@ __PACKAGE__->register_method ({
if (! -f $mon_keyring) { if (! -f $mon_keyring) {
print "creating new monitor keyring\n"; print "creating new monitor keyring\n";
run_command("ceph-authtool --create-keyring $mon_keyring ". run_command([
" --gen-key -n mon. --cap mon 'allow *'"); 'ceph-authtool',
run_command("ceph-authtool $mon_keyring --import-keyring $client_keyring"); '--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'); my $ccname = PVE::Ceph::Tools::get_config('ccname');
@ -243,7 +257,7 @@ __PACKAGE__->register_method ({
eval { eval {
mkdir $mondir; 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 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' }); 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_ipv6} = 'true';
$cfg->{global}->{ms_bind_ipv4} = 'false'; $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([
run_command("chown ceph:ceph -R $mondir"); 'ceph-mon',
'--mkfs',
'-i',
$monid,
'--monmap',
$monmap,
'--keyring',
$mon_keyring,
]);
run_command(['chown', 'ceph:ceph', '-R', $mondir]);
}; };
my $err = $@; my $err = $@;
unlink $monmap; unlink $monmap;