foreman_bootdisk 23.0.0 → 23.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2953eaa163391d29858def498833920f069bc5565f71ac0e535b173d8965d922
-  data.tar.gz: 6c80849f4cca281f3d4de80758c302a3355915a7f51d7dc6234ed89b8ad7efce
+  metadata.gz: bd3257bab9ef8d2bd81645a9bc07a72818436797704eb457b9c0cd96822c3d2e
+  data.tar.gz: 2eab92f59d7a5ac630a1bc6032f46dc3d6d1eace620ddbaa4aebef7170a93175
 SHA512:
-  metadata.gz: '09f1c3d97e04c81cfb630310c5374a53c8596ab6418a912c29163a2b2cc970b992479abc2a37925ef95d1c8d2b7c01c136f092f5562523947f10f0d9dfba788a'
-  data.tar.gz: 6c093377e782eb515e56d61309959f041e7daacb7fa8ed1d472237399c6f96a5ea4fc5d91e782f6e3a1644dc00c67a418e0e38b4a4519fbeeebd88144193496f
+  metadata.gz: 87443ca44460fe71f04b47f76832ca5754d6f6ea2a0030714f01e6c873be0dfa3c268c011ed08df41347b346a50645f6a85cfa54dffb9fd90976f263bb93b709
+  data.tar.gz: 7bb4e64a58ad842bbee07e89ded9b0a078a2447b062b96565fede150e410e97e06c50fdc77688aad7f16ac3b6a991e903f88d34ab05af6ce374399a557c5b7b7

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

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module ForemanBootdisk
+  module ComputeResources
+    module Proxmox
+      CDROM_VOLUME = 'ide2'
+
+      def capabilities
+        super + [:bootdisk]
+      end
+
+      def iso_upload(iso, vm_uuid)
+        server = find_vm_by_uuid(vm_uuid)
+        server.ssh_options = { password: fog_credentials[:proxmox_password] }
+        server.ssh_ip_address = proxmox_host
+        server.username = client.credentials[:current_user].split('@').first
+        server.scp_upload(iso, '/var/lib/vz/template/iso/')
+        server.reload
+        storage = storages(server.node_id, 'iso')[0]
+        storage.volumes.any? { |v| v.volid.include? File.basename(iso) }
+      end
+
+      def iso_attach(iso, vm_uuid)
+        server = find_vm_by_uuid(vm_uuid)
+        storage = storages(server.node_id, 'iso')[0]
+        volume = storage.volumes.detect { |v| v.volid.include? File.basename(iso) }
+        disks = server.disks.map { |disk| disk.split(":")[0] }.join(";")
+        server.update({ ide2: "#{volume.volid},media=cdrom" })
+        server.update({ boot: "order=ide2;#{disks}" })
+        server.reboot
+      end
+
+      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
+end

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

@@ -12,7 +12,7 @@ module ForemanBootdisk
         if args[:provision_method] == 'bootdisk'
           args[:cdroms] = [new_cdrom]
           args[:boot_order] = %w[cdrom disk]
-          args[:boot_retry] = 10
+          args[:boot_retry] = 10 * 1000 # boot_retry is in ms. Shortest is 10s
         end
         args
       end

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -133,6 +133,7 @@ module ForemanBootdisk
           File.join(wd, 'build', 'grub-hdd.cfg').to_s => 'GRUB.CFG',
           File.join(Setting[:bootdisk_grub2_dir], 'grubx64.efi').to_s => 'GRUBX64.EFI',
           File.join(Setting[:bootdisk_grub2_dir], 'shimx64.efi').to_s => 'BOOTX64.EFI',
+          File.join(Setting[:bootdisk_grub2_dir], 'mmx64.efi').to_s => 'MMX64.EFI',
         }.each do |src, dest|
           raise(Foreman::Exception.new(N_('Ensure %{file} is readable (or update "Grub2 directory" setting)'), file: src)) unless File.exist?(src)
           raise(Foreman::Exception.new(N_('Unable to mcopy %{file}'), file: src)) unless system("mcopy -m -i #{efibootimg} '#{src}' '#{"::/EFI/BOOT/#{dest}"}'")

data/lib/foreman_bootdisk/engine.rb

@@ -140,6 +140,7 @@ module ForemanBootdisk
         Host::Managed.prepend ForemanBootdisk::HostExt
         Host::Managed.include ForemanBootdisk::Orchestration::Compute
         Foreman::Model::Vmware.prepend ForemanBootdisk::ComputeResources::Vmware if Foreman::Model::Vmware.available?
+        ForemanFogProxmox::Proxmox.prepend ForemanBootdisk::ComputeResources::Proxmox if ForemanBootdisk.with_proxmox?
       rescue StandardError => e
         Rails.logger.warn "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e})"
       end
@@ -149,4 +150,8 @@ module ForemanBootdisk
   def self.logger
     Foreman::Logging.logger('foreman_bootdisk')
   end
+
+  def self.with_proxmox?
+    Foreman::Plugin.installed?('foreman_fog_proxmox')
+  end
 end

data/lib/foreman_bootdisk/version.rb

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

data/webpack/src/extensions/host/HostBootdiskButtons.js

@@ -60,6 +60,7 @@ const HostBootdiskButtons = () => {
         isDisabled={action.disabled}
         description={action.description}
         icon={iconComponent(action.icon)}
+        ouiaId={`bootdisk button ${i}`}
       >
         {action.title}
       </DropdownItem>
@@ -68,6 +69,7 @@ const HostBootdiskButtons = () => {
     content = (
       <DropdownItem
         key="bootdisk-unavailable"
+        ouiaId="bootdisk button unavailable"
         component="button"
         href="#"
         tooltip={sprintf(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 23.0.0
+  version: 23.1.1
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -68,6 +68,7 @@ files:
 - app/lib/foreman_bootdisk/scope/full_host_bootdisk.rb
 - app/lib/foreman_bootdisk/scope/full_host_bootdisk_efi.rb
 - app/lib/foreman_bootdisk/template_helpers.rb
+- app/models/concerns/foreman_bootdisk/compute_resources/proxmox.rb
 - app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb
 - app/models/concerns/foreman_bootdisk/host_ext.rb
 - app/models/concerns/foreman_bootdisk/orchestration/compute.rb
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman