foreman_bootdisk 22.0.3 → 23.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7198cdd107f1122f317d721826a524a8aaf42191b5fae7f0a0f28cbdce876240
-  data.tar.gz: 3718c74b4c6028d1ecd0c688f637b6fa1bf249203ca976897e5056669462a597
+  metadata.gz: 7115babe231d5d12bf7cf520823714559a7f9c9435df2aff0f1e30e431bef3d7
+  data.tar.gz: e0ef9f391e1a762225c6e02c81c8312645d4639420b53db8f40f88f7bf7d608a
 SHA512:
-  metadata.gz: 427b3cc233728bb56d571a6c0e883bed4526d4045e0418643c7d1e72ebe84a6150cd6481708103aa9953ab9876ab761932827aed02cd59f825c0301b7c944607
-  data.tar.gz: c621b821c7b79b89c07fd42d1eae40f02ee191a14d4d34bc9eebf905defcec3b3c701d1a0343a50fafb178b30f102eccfd7910533c6d20975627b9d27d37f5b9
+  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

@@ -26,7 +26,7 @@ module ForemanBootdisk
     initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |app|
       app.reloader.to_prepare do
         Foreman::Plugin.register :foreman_bootdisk do
-          requires_foreman '>= 3.13'
+          requires_foreman '>= 3.15'
           # Add Global files for extending foreman-core components and routes
           register_global_js_file 'global'
           register_gettext
@@ -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 = '22.0.3'
+  VERSION = '23.1.0'
 end

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

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
-import { DropdownItem, DropdownGroup } from '@patternfly/react-core';
+import { DropdownItem, DropdownGroup } from '@patternfly/react-core/deprecated';
 import {
   BanIcon,
   BuildIcon,

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 22.0.3
+  version: 23.1.0
 platform: ruby
 authors:
 - Dominic Cleal
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-20 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
@@ -91,77 +91,44 @@ files:
 - db/migrate/20221102105354_fix_bootdisk_settings_category_to_dsl.rb
 - lib/foreman_bootdisk.rb
 - lib/foreman_bootdisk/engine.rb
-- lib/foreman_bootdisk/engine.rb.orig
 - lib/foreman_bootdisk/version.rb
 - lib/tasks/bootdisk.rake
 - locale/Makefile
 - locale/ca/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ca/foreman_bootdisk.edit.po
 - locale/ca/foreman_bootdisk.po
-- locale/ca/foreman_bootdisk.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_bootdisk.mo
-- locale/cs_CZ/foreman_bootdisk.edit.po
 - locale/cs_CZ/foreman_bootdisk.po
-- locale/cs_CZ/foreman_bootdisk.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_bootdisk.mo
-- locale/de/foreman_bootdisk.edit.po
 - locale/de/foreman_bootdisk.po
-- locale/de/foreman_bootdisk.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_bootdisk.mo
-- locale/en/foreman_bootdisk.edit.po
 - locale/en/foreman_bootdisk.po
-- locale/en/foreman_bootdisk.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_bootdisk.mo
-- locale/en_GB/foreman_bootdisk.edit.po
 - locale/en_GB/foreman_bootdisk.po
-- locale/en_GB/foreman_bootdisk.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_bootdisk.mo
-- locale/es/foreman_bootdisk.edit.po
 - locale/es/foreman_bootdisk.po
-- locale/es/foreman_bootdisk.po.time_stamp
 - locale/foreman_bootdisk.pot
 - locale/fr/LC_MESSAGES/foreman_bootdisk.mo
-- locale/fr/foreman_bootdisk.edit.po
 - locale/fr/foreman_bootdisk.po
-- locale/fr/foreman_bootdisk.po.time_stamp
 - locale/gemspec.rb
 - locale/it/LC_MESSAGES/foreman_bootdisk.mo
-- locale/it/foreman_bootdisk.edit.po
 - locale/it/foreman_bootdisk.po
-- locale/it/foreman_bootdisk.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ja/foreman_bootdisk.edit.po
 - locale/ja/foreman_bootdisk.po
-- locale/ja/foreman_bootdisk.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ka/foreman_bootdisk.edit.po
 - locale/ka/foreman_bootdisk.po
-- locale/ka/foreman_bootdisk.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ko/foreman_bootdisk.edit.po
 - locale/ko/foreman_bootdisk.po
-- locale/ko/foreman_bootdisk.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_bootdisk.mo
-- locale/pt_BR/foreman_bootdisk.edit.po
 - locale/pt_BR/foreman_bootdisk.po
-- locale/pt_BR/foreman_bootdisk.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ru/foreman_bootdisk.edit.po
 - locale/ru/foreman_bootdisk.po
-- locale/ru/foreman_bootdisk.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_bootdisk.mo
-- locale/sv_SE/foreman_bootdisk.edit.po
 - locale/sv_SE/foreman_bootdisk.po
-- locale/sv_SE/foreman_bootdisk.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_bootdisk.mo
-- locale/zh_CN/foreman_bootdisk.edit.po
 - locale/zh_CN/foreman_bootdisk.po
-- locale/zh_CN/foreman_bootdisk.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_bootdisk.mo
-- locale/zh_TW/foreman_bootdisk.edit.po
 - locale/zh_TW/foreman_bootdisk.po
-- locale/zh_TW/foreman_bootdisk.po.time_stamp
 - package.json
 - webpack/__mocks__/foremanReact/common/HOC.js
 - webpack/__mocks__/foremanReact/common/I18n.js
@@ -182,7 +149,6 @@ homepage: https://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman
 test_files: []

data/lib/foreman_bootdisk/engine.rb.orig

@@ -1,159 +0,0 @@
-# frozen_string_literal: true
-
-require 'foreman_bootdisk'
-require 'fast_gettext'
-require 'gettext_i18n_rails'
-
-module ForemanBootdisk
-  class Engine < ::Rails::Engine
-    engine_name 'foreman_bootdisk'
-    isolate_namespace ForemanBootdisk
-
-    initializer 'foreman_bootdisk.mount_engine' do |app|
-      app.routes_reloader.paths << "#{ForemanBootdisk::Engine.root}/config/routes/mount_engine.rb"
-    end
-
-    initializer 'foreman_bootdisk.load_app_instance_data' do |app|
-      ForemanBootdisk::Engine.paths['db/migrate'].existent.each do |path|
-        app.config.paths['db/migrate'] << path
-      end
-    end
-
-    initializer 'foreman_bootdisk.apipie' do
-      Apipie.configuration.checksum_path += ['/bootdisk/api/']
-    end
-
-    initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |app|
-      app.reloader.to_prepare do
-        Foreman::Plugin.register :foreman_bootdisk do
-          requires_foreman '>= 3.13'
-          # Add Global files for extending foreman-core components and routes
-          register_global_js_file 'global'
-          register_gettext
-
-          security_block :bootdisk do |_map|
-            permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host help bootdisk_options],
-                                          'foreman_bootdisk/subnet_disks': [:subnet],
-                                          'foreman_bootdisk/api/v2/disks': %i[generic host],
-                                          'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
-          end
-
-          role 'Boot disk access', [:download_bootdisk], 'Role granting permissions to download bootdisks'
-          add_all_permissions_to_default_roles
-
-          apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
-          ApipieDSL.configuration.dsl_classes_matchers += [
-            "#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
-          ]
-          provision_method 'bootdisk', N_('Boot disk based')
-          allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
-
-<<<<<<< HEAD
-          extend_page "subnets/index" do |cx|
-            cx.add_pagelet :subnet_index_action_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_action_buttons'
-            cx.add_pagelet :subnet_index_title_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_title_buttons'
-          end
-=======
-        apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
-        ApipieDSL.configuration.dsl_classes_matchers += [
-          "#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
-        ]
-        provision_method 'bootdisk', N_('Boot disk based')
-        extend_template_helpers ForemanBootdisk::TemplateHelpers
->>>>>>> 968ca20 (Fixes #37792 - Safe mode and bootdisk_* template helpers)
-
-          settings do
-            category :bootdisk, N_("Boot disk") do
-              ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
-              isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
-              syslinux = ['/usr/lib/syslinux/modules/bios', '/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
-              grub2 = ['/var/lib/tftpboot/grub2'].find { |p| File.exist?(p) } || '/var/lib/foreman/bootdisk'
-              templates = -> {
-                Hash[ProvisioningTemplate.where(template_kind: TemplateKind.where(name: 'Bootdisk')).map { |temp| [temp[:name], temp[:name]] }]
-              }
-
-              setting "bootdisk_ipxe_dir",
-                type: :string,
-                default: ipxe,
-                full_name: N_("iPXE directory"),
-                description: N_("Path to directory containing iPXE images")
-
-              setting "bootdisk_isolinux_dir",
-                type: :string,
-                default: isolinux,
-                full_name: N_("ISOLINUX directory"),
-                description: N_("Path to directory containing isolinux images")
-
-              setting "bootdisk_syslinux_dir",
-                type: :string,
-                default: syslinux,
-                full_name: N_("SYSLINUX directory"),
-                description: N_("Path to directory containing syslinux images")
-
-              setting "bootdisk_grub2_dir",
-                type: :string,
-                default: grub2,
-                full_name: N_("Grub2 directory"),
-                description: N_("Path to directory containing grubx64.efi and shimx64.efi")
-
-              setting "bootdisk_host_template",
-                type: :string,
-                collection: templates,
-                default: "Boot disk iPXE - host",
-                full_name: N_("Host image template"),
-                description: N_("iPXE template to use for host-specific boot disks")
-
-              setting "bootdisk_generic_host_template",
-                type: :string,
-                collection: templates,
-                default: "Boot disk iPXE - generic host",
-                full_name: N_("Generic image template"),
-                description: N_("iPXE template to use for generic host boot disks")
-
-              setting "bootdisk_generic_efi_host_template",
-                type: :string,
-                collection: templates,
-                default: "Boot disk Grub2 EFI - generic host",
-                full_name: N_("Generic Grub2 EFI image template"),
-                description: N_("iPXE template to use for generic EFI host boot disks")
-
-              setting "bootdisk_mkiso_command",
-                type: :string,
-                default: "genisoimage",
-                full_name: N_("ISO generation command"),
-                description: N_("Command to generate ISO image, use genisoimage or mkisofs")
-
-              setting "bootdisk_cache_media",
-                type: :boolean,
-                default: true,
-                full_name: N_("Installation media caching"),
-                description: N_("Installation media files will be cached for full host images")
-
-              setting "bootdisk_allowed_types",
-                type: :array,
-                default: Setting::Bootdisk.bootdisk_types,
-                full_name: N_("Allowed bootdisk types"),
-                description: N_("List of allowed bootdisk types, remove type to disable it")
-            end
-          end
-        end
-      end
-    end
-
-    config.to_prepare do
-      begin
-        ::HostsHelper.prepend ForemanBootdisk::HostsHelperExt
-        ::SubnetsHelper.include ForemanBootdisk::SubnetsHelperExt
-        Host::Managed.prepend ForemanBootdisk::HostExt
-        Host::Managed.include ForemanBootdisk::Orchestration::Compute
-        Foreman::Model::Vmware.prepend ForemanBootdisk::ComputeResources::Vmware if Foreman::Model::Vmware.available?
-      rescue StandardError => e
-        Rails.logger.warn "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e})"
-      end
-    end
-  end
-
-  def self.logger
-    Foreman::Logging.logger('foreman_bootdisk')
-  end
-end