foreman_bootdisk 23.0.0 → 23.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2953eaa163391d29858def498833920f069bc5565f71ac0e535b173d8965d922
-  data.tar.gz: 6c80849f4cca281f3d4de80758c302a3355915a7f51d7dc6234ed89b8ad7efce
+  metadata.gz: 7115babe231d5d12bf7cf520823714559a7f9c9435df2aff0f1e30e431bef3d7
+  data.tar.gz: e0ef9f391e1a762225c6e02c81c8312645d4639420b53db8f40f88f7bf7d608a
 SHA512:
-  metadata.gz: '09f1c3d97e04c81cfb630310c5374a53c8596ab6418a912c29163a2b2cc970b992479abc2a37925ef95d1c8d2b7c01c136f092f5562523947f10f0d9dfba788a'
-  data.tar.gz: 6c093377e782eb515e56d61309959f041e7daacb7fa8ed1d472237399c6f96a5ea4fc5d91e782f6e3a1644dc00c67a418e0e38b4a4519fbeeebd88144193496f
+  metadata.gz: 7a528c3019743c86ce6920ae26c3ede482c73ab60a31b9dc631c3eb5bedb64c1735b8b05250e5c8e41f0154689f5e06b01a97ea484bdf86a279da1c9773d9a11
+  data.tar.gz: f0291a50c6b5ed15cedbeb76fd3862ccafd830b6ae1cb8fad0f90eed3e51ba3c796bdef5c00b067f4159b97b4d1ca63f005605f52bb00879e75c1696e089dea5

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/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.0'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 23.0.0
+  version: 23.1.0
 platform: ruby
 authors:
 - Dominic Cleal
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -68,6 +67,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
@@ -149,7 +149,6 @@ homepage: https://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -167,8 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman
 test_files: []