proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-07 16:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ceph: move mgr create/destroy to Ceph::Services

Browse Source 
and adapt the paths and callers

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2018-12-19 11:24:45 +01:00 committed by Thomas Lamprecht
parent 79fa41a2b8
commit be7edba15d
2 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
PVE/API2/Ceph.pm
View File

@ -438,58 +438,6 @@ my $find_mon_ip = sub {
} }
}; };
my $create_mgr = sub {
my ($rados, $id) = @_;
my $clustername = PVE::Ceph::Tools::get_config('ccname');
my $mgrdir = "/var/lib/ceph/mgr/$clustername-$id";
my $mgrkeyring = "$mgrdir/keyring";
my $mgrname = "mgr.$id";
die "ceph manager directory '$mgrdir' already exists\n"
if -d $mgrdir;
print "creating manager directory '$mgrdir'\n";
mkdir $mgrdir;
print "creating keys for '$mgrname'\n";
my $output = $rados->mon_command({ prefix => 'auth get-or-create',
entity => $mgrname,
caps => [
mon => 'allow profile mgr',
osd => 'allow *',
mds => 'allow *',
],
format => 'plain'});
file_set_contents($mgrkeyring, $output);
print "setting owner for directory\n";
run_command(["chown", 'ceph:ceph', '-R', $mgrdir]);
print "enabling service 'ceph-mgr\@$id.service'\n";
PVE::Ceph::Services::ceph_service_cmd('enable', $mgrname);
print "starting service 'ceph-mgr\@$id.service'\n";
PVE::Ceph::Services::ceph_service_cmd('start', $mgrname);
};
my $destroy_mgr = sub {
my ($mgrid) = @_;
my $clustername = PVE::Ceph::Tools::get_config('ccname');
my $mgrname = "mgr.$mgrid";
my $mgrdir = "/var/lib/ceph/mgr/$clustername-$mgrid";
die "ceph manager directory '$mgrdir' not found\n"
if ! -d $mgrdir;
print "disabling service 'ceph-mgr\@$mgrid.service'\n";
PVE::Ceph::Services::ceph_service_cmd('disable', $mgrname);
print "stopping service 'ceph-mgr\@$mgrid.service'\n";
PVE::Ceph::Services::ceph_service_cmd('stop', $mgrname);
print "removing manager directory '$mgrdir'\n";
File::Path::remove_tree($mgrdir);
};
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'createmon', name => 'createmon',
path => 'mon', path => 'mon',
@ -653,7 +601,7 @@ __PACKAGE__->register_method ({
# create manager # create manager
if (!$param->{'exclude-manager'}) { if (!$param->{'exclude-manager'}) {
my $rados = PVE::RADOS->new(timeout => PVE::Ceph::Tools::get_config('long_rados_timeout')); my $rados = PVE::RADOS->new(timeout => PVE::Ceph::Tools::get_config('long_rados_timeout'));
$create_mgr->($rados, $monid); PVE::Ceph::Services::create_mgr($monid, $rados);
} }
}; };
@ -733,7 +681,7 @@ __PACKAGE__->register_method ({
# remove manager # remove manager
if (!$param->{'exclude-manager'}) { if (!$param->{'exclude-manager'}) {
eval { $destroy_mgr->($monid); }; eval { PVE::Ceph::Services::destroy_mgr($mgrid) };
warn $@ if $@; warn $@ if $@;
} }
}; };
@ -782,7 +730,7 @@ __PACKAGE__->register_method ({
my $rados = PVE::RADOS->new(timeout => PVE::Ceph::Tools::get_config('long_rados_timeout')); my $rados = PVE::RADOS->new(timeout => PVE::Ceph::Tools::get_config('long_rados_timeout'));
$create_mgr->($rados, $mgrid); PVE::Ceph::Services::create_mgr($mgrid, $rados);
}; };
return $rpcenv->fork_worker('cephcreatemgr', "mgr.$mgrid", $authuser, $worker); return $rpcenv->fork_worker('cephcreatemgr', "mgr.$mgrid", $authuser, $worker);
@ -824,7 +772,7 @@ __PACKAGE__->register_method ({
my $worker = sub { my $worker = sub {
my $upid = shift; my $upid = shift;
$destroy_mgr->($mgrid); PVE::Ceph::Services::destroy_mgr($mgrid);
}; };
return $rpcenv->fork_worker('cephdestroymgr', "mgr.$mgrid", $authuser, $worker); return $rpcenv->fork_worker('cephdestroymgr', "mgr.$mgrid", $authuser, $worker);

54
PVE/Ceph/Services.pm
View File

@ -194,4 +194,58 @@ sub destroy_mds {
return undef; return undef;
}; };
# MGR
sub create_mgr {
my ($id, $rados) = @_;
my $clustername = PVE::Ceph::Tools::get_config('ccname');
my $mgrdir = "/var/lib/ceph/mgr/$clustername-$id";
my $mgrkeyring = "$mgrdir/keyring";
my $mgrname = "mgr.$id";
die "ceph manager directory '$mgrdir' already exists\n"
if -d $mgrdir;
print "creating manager directory '$mgrdir'\n";
mkdir $mgrdir;
print "creating keys for '$mgrname'\n";
my $output = $rados->mon_command({ prefix => 'auth get-or-create',
entity => $mgrname,
caps => [
mon => 'allow profile mgr',
osd => 'allow *',
mds => 'allow *',
],
format => 'plain'});
PVE::Tools::file_set_contents($mgrkeyring, $output);
print "setting owner for directory\n";
run_command(["chown", 'ceph:ceph', '-R', $mgrdir]);
print "enabling service 'ceph-mgr\@$id.service'\n";
ceph_service_cmd('enable', $mgrname);
print "starting service 'ceph-mgr\@$id.service'\n";
ceph_service_cmd('start', $mgrname);
}
sub destroy_mgr {
my ($mgrid) = @_;
my $clustername = PVE::Ceph::Tools::get_config('ccname');
my $mgrname = "mgr.$mgrid";
my $mgrdir = "/var/lib/ceph/mgr/$clustername-$mgrid";
die "ceph manager directory '$mgrdir' not found\n"
if ! -d $mgrdir;
print "disabling service 'ceph-mgr\@$mgrid.service'\n";
ceph_service_cmd('disable', $mgrname);
print "stopping service 'ceph-mgr\@$mgrid.service'\n";
ceph_service_cmd('stop', $mgrname);
print "removing manager directory '$mgrdir'\n";
File::Path::remove_tree($mgrdir);
}
1; 1;