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

rbd: use add/delete hooks

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2018-07-02 15:54:46 +02:00
committed by Wolfgang Bumiller
parent ab5e32bb1d
commit 2e109b4bc2
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,21 +182,6 @@ __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 {
mkdir '/etc/pve/priv/ceph';
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";
}
} }
eval { eval {
@ -297,13 +282,6 @@ __PACKAGE__->register_method ({
$plugin->on_delete_hook($storeid, $scfg); $plugin->on_delete_hook($storeid, $scfg);
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);

34
PVE/Storage/RBDPlugin.pm
View File

@ -320,6 +320,40 @@ sub options {
# Storage implementation # Storage implementation
sub on_add_hook {
my ($class, $storeid, $scfg, %param) = @_;
return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
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 {
mkdir '/etc/pve/priv/ceph';
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";
}
}
sub on_delete_hook {
my ($class, $storeid, $scfg) = @_;
return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
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";
}
}
sub parse_volname { sub parse_volname {
my ($class, $volname) = @_; my ($class, $volname) = @_;