foreman_bootdisk 23.2.2 → 23.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b3c82de3e1162b3913f70034ebb9ac53fec5caeef51eefc5a13f3bacbfa6466
-  data.tar.gz: c1a787f40d59615d4d572f5ea25285e2d25af4a05051ec2384af811c517e04f4
+  metadata.gz: 47a164e7be4aa1b774c02d0b73a90ddb273e4db96faa93c618d455b7eb82a0ce
+  data.tar.gz: 2983f0ff062f2e0e9e8564ce481cc9f7627a5331183bb7fd837616d4cf9e83eb
 SHA512:
-  metadata.gz: dca4043b39111ac73a1922f5fc9b28683c24a84e25fcf999476416515a1c387fb0b80722d319cde0f4e4afbeee286e6aa621979a11bc19280cda3cd324127c77
-  data.tar.gz: 6699fe11d34ee10e02261b15e123cc9ffc791cefbd207351369917009c3cc0c98d853b0f869953d2350aeb6aeaec773f809c9b0034c66df6c59f31569c4a1666
+  metadata.gz: 97a88a100772292d55017f68debb1492a5fac35f4e5a095fa20dfb0647541cfd17cebade99f1a92fc6643ae9ccf0e7645fd9296987fe4f8d23c9d7b3f2708bd2
+  data.tar.gz: 58d5311b0ae20b4baf16dff3ff96cd69e096798717900d146b1a2a83497d92fa144379853f8648edcfc91049bf1467ecc3c74bfced47c5d5deb7f0cf89bf7e7e

data/app/models/concerns/foreman_bootdisk/compute_resources/proxmox.rb

@@ -20,6 +20,15 @@ module ForemanBootdisk
         storage.volumes.any? { |v| v.volid.include? File.basename(iso) }
       end
 
+      def iso_delete(iso, vm_uuid)
+        server = find_vm_by_uuid(vm_uuid)
+
+        # delete the iso file from proxmox server
+        storage = storages(server.node_id, 'iso')[0]
+        volume = storage.volumes.detect { |v| v.volid.include? File.basename(iso) }
+        volume&.destroy
+      end
+
       def iso_attach(iso, vm_uuid)
         server = find_vm_by_uuid(vm_uuid)
         storage = storages(server.node_id, 'iso')[0]
@@ -31,18 +40,10 @@ module ForemanBootdisk
 
       def iso_detach(vm_uuid)
         server = find_vm_by_uuid(vm_uuid)
-
-        # get volid to delete iso after detaching from vm
-        volid = server.volumes.get(CDROM_VOLUME).volid
         server.update({ ide2: "none,media=cdrom" })
 
         # cdrom will be ejected on next power off
         server.detach(CDROM_VOLUME)
-
-        # delete the iso file from proxmox server
-        storage = storages(server.node_id, 'iso')[0]
-        volume = storage.volumes.detect { |v| v.volid.include? volid }
-        volume.destroy
       end
     end
   end

data/app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb

@@ -31,6 +31,16 @@ module ForemanBootdisk
         client.upload_iso options
       end
 
+      def iso_delete(iso, vm_uuid)
+        options = {
+          'local_path' => iso,
+          'datacenter' => dc.name,
+          'datastore' => bootdisk_datastore(vm_uuid),
+          'upload_directory' => 'foreman_isos'
+        }
+        client.destroy_iso options
+      end
+
       def iso_attach(iso, vm_uuid)
         controller = controller_config(vm_uuid)
         options = {

data/app/models/concerns/foreman_bootdisk/orchestration/compute.rb

@@ -37,6 +37,8 @@ module ForemanBootdisk
         elsif old&.build? && !build?
           queue.create(name: _('Detach ISO image from CDROM drive for %s') % self, priority: 52,
                        action: [self, :setDetachIsoImage])
+          queue.create(name: _('Delete ISO image for %s') % self, priority: 53,
+                       action: [self, :setDeleteIsoImage])
         end
         true
       end
@@ -59,6 +61,10 @@ module ForemanBootdisk
         compute_resource.iso_upload(bootdisk_isofile, uuid)
       end
 
+      def bootdisk_delete_iso
+        compute_resource.iso_delete(bootdisk_isofile, uuid)
+      end
+
       def bootdisk_attach_iso
         compute_resource.iso_attach(File.basename(bootdisk_isofile), uuid)
       end
@@ -101,6 +107,16 @@ module ForemanBootdisk
       end
 
       def delDetachIsoImage; end
+
+      def setDeleteIsoImage
+        logger.info format('Delete ISO image for %s', name)
+        bootdisk_delete_iso
+      rescue StandardError => e
+        failure format(_('Failed to delete ISO image of instance %{name}: %{message}'), name: name, message: e.message), e
+      end
+
+      def delDeleteIsoImage; end
+
     end
   end
 end

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -205,7 +205,7 @@ module ForemanBootdisk
         file.binmode
 
         if use_cache && !(contents = Rails.cache.fetch(uri, raw: true)).nil?
-          ForemanBootdisk.logger.info("Retrieved #{uri} from local cache (use foreman-rake tmp:cache:clear to empty)")
+          ForemanBootdisk.logger.info("Retrieved #{uri} from local cache")
           file.write(contents)
         else
           ForemanBootdisk.logger.info("Fetching #{uri}")

data/lib/foreman_bootdisk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanBootdisk
-  VERSION = '23.2.2'
+  VERSION = '23.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 23.2.2
+  version: 23.2.3
 platform: ruby
 authors:
 - Dominic Cleal
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman
 test_files: []