From 5a39d0a111ffdc55fc3a07979e20da20e01fc060 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Tue, 5 Sep 2017 14:59:33 +0200 Subject: [PATCH] rbd: manage keyring for pveceph storages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- PVE/API2/Storage/Config.pm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Storage/Config.pm b/PVE/API2/Storage/Config.pm index 4668af6..6c9b3b1 100755 --- a/PVE/API2/Storage/Config.pm +++ b/PVE/API2/Storage/Config.pm @@ -162,6 +162,20 @@ __PACKAGE__->register_method ({ PVE::Storage::activate_storage($cfg, $baseid); 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, @@ -245,12 +259,18 @@ __PACKAGE__->register_method ({ my $cfg = PVE::Storage::config(); - die "storage '$storeid' does not exist\n" - if !($cfg->{ids}->{$storeid}); + my $scfg = PVE::Storage::storage_config($cfg, $storeid); die "can't remove storage - storage is used as base of another storage\n" 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}; PVE::Storage::write_config($cfg); -- 2.39.2