yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: manage keyring for pveceph storages

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2017-09-05 14:59:33 +02:00
committed by Wolfgang Bumiller
parent 6eebc4a78a
commit 5a39d0a111
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/API2/Storage/Config.pm
View File

@ -162,6 +162,20 @@ __PACKAGE__->register_method ({
PVE::Storage::activate_storage($cfg, $baseid); PVE::Storage::activate_storage($cfg, $baseid);
PVE::Storage::LVMPlugin::lvm_create_volume_group($path, $opts->{vgname}, $opts->{shared}); PVE::Storage::LVMPlugin::lvm_create_volume_group($path, $opts->{vgname}, $opts->{shared});
} elsif ($type eq 'rbd' && !defined($opts->{monhost})) {
my $ceph_admin_keyring = '/etc/pve/priv/ceph.client.admin.keyring';
my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
die "ceph authx keyring file for storage '$storeid' already exists!\n"
if -e $ceph_storage_keyring;
eval {
PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring);
};
if (my $err = $@) {
unlink $ceph_storage_keyring;
die "failed to copy ceph authx keyring for storage '$storeid': $err\n";
}
} }
# try to activate if enabled on local node, # try to activate if enabled on local node,
@ -245,12 +259,18 @@ __PACKAGE__->register_method ({
my $cfg = PVE::Storage::config(); my $cfg = PVE::Storage::config();
die "storage '$storeid' does not exist\n" my $scfg = PVE::Storage::storage_config($cfg, $storeid);
if !($cfg->{ids}->{$storeid});
die "can't remove storage - storage is used as base of another storage\n" die "can't remove storage - storage is used as base of another storage\n"
if PVE::Storage::storage_is_used($cfg, $storeid); if PVE::Storage::storage_is_used($cfg, $storeid);
if ($scfg->{type} eq 'rbd' && !defined($scfg->{monhost})) {
my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
if (-f $ceph_storage_keyring) {
unlink($ceph_storage_keyring) or warn "removing keyring of storage failed: $!\n";
}
}
delete $cfg->{ids}->{$storeid}; delete $cfg->{ids}->{$storeid};
PVE::Storage::write_config($cfg); PVE::Storage::write_config($cfg);