api: disks: delete: add flag for cleaning up storage config

[pve-storage.git] / PVE / API2 / Disks / LVM.pm

diff --git a/PVE/API2/Disks/LVM.pm b/PVE/API2/Disks/LVM.pm
index 1af3d43a586d9a1ecbc6a90d4278b7e819a726d6..6e4331ad9708804babf25a77635468bb1b910bad 100644 (file)
--- a/PVE/API2/Disks/LVM.pm
+++ b/PVE/API2/Disks/LVM.pm
@@ -198,6 +198,13 @@ __PACKAGE__->register_method ({
        properties => {
            node => get_standard_option('pve-node'),
            name => get_standard_option('pve-storage-id'),
+           'cleanup-config' => {
+               description => "Marks associated storage(s) as not available on this node anymore ".
+                   "or removes them from the configuration (if configured for this node only).",
+               type => 'boolean',
+               optional => 1,
+               default => 0,
+           },
            'cleanup-disks' => {
                description => "Also wipe disks so they can be repurposed afterwards.",
                type => 'boolean',
@@ -214,6 +221,7 @@ __PACKAGE__->register_method ({
        my $user = $rpcenv->get_user();
 
        my $name = $param->{name};
+       my $node = $param->{node};
 
        my $worker = sub {
            PVE::Diskmanage::locked_disk_action(sub {
@@ -222,6 +230,16 @@ __PACKAGE__->register_method ({
 
                PVE::Storage::LVMPlugin::lvm_destroy_volume_group($name);
 
+               my $config_err;
+               if ($param->{'cleanup-config'}) {
+                   my $match = sub {
+                       my ($scfg) = @_;
+                       return $scfg->{type} eq 'lvm' && $scfg->{vgname} eq $name;
+                   };
+                   eval { PVE::API2::Storage::Config->cleanup_storages_for_node($match, $node); };
+                   warn $config_err = $@ if $@;
+               }
+
                if ($param->{'cleanup-disks'}) {
                    my $wiped = [];
                    eval {
@@ -235,6 +253,8 @@ __PACKAGE__->register_method ({
                    PVE::Diskmanage::udevadm_trigger($wiped->@*);
                    die "cleanup failed - $err" if $err;
                }
+
+               die "config cleanup failed - $config_err" if $config_err;
            });
        };