foreman_rescue 4.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd0bce1ad2fa35f301d40febfbeccede3ed3d5134ece9a75a27f6b468bb8e2ae
-  data.tar.gz: f2d4236c22ae308055658f79811b2dd7b88b15b9669b353db942a6610131e7ae
+  metadata.gz: '056686d37786da37f4c4dad82382e4934bdf800a3219d5865480468d7da931e4'
+  data.tar.gz: 54d533f18caded8b753e2603219ac1d7d5b9039c08211c9f325190f68e218e95
 SHA512:
-  metadata.gz: fe7c1775d102b27647d909ee0a0e1df46fcf3ea5dd4090fde64d793f03c44965f24a071e781973422579b576e15e838d881d2d57f4d2ef801616594a57d94deb
-  data.tar.gz: 269e2a963a5d9030794832dff7f18541cbafe183c47495c2e6a9aef51ad31379ca8a5f2df0b4c1c48eab74465eca5a76429cdfac8ea04cbc4877d013ba6a638f
+  metadata.gz: 8b0e8bc5397186656746ff56e6b9d171610fda4b03542e10158dfec371d673662e9edc5bfc5bbb38829b68340d2edf7bdbb6a795a6f8732a57140173e33e5548
+  data.tar.gz: 4fe0ecdcdfa1f0666df12eee77d2d7ea204fc7c3c6468a6f469127d78345a94845744a843e71dc6b28dfabe5ceb3c5a8f0430acda332bbd62ba60b76ec06ad7d

data/README.md

@@ -13,6 +13,7 @@ This plugin allows a user to boot a Foreman host into a rescue system via PXE.
 | >= 1.20         | ~> 2.0         |
 | >= 1.21         | ~> 3.0         |
 | >= 3.9          | ~> 4.0         |
+| >= 3.13         | ~> 5.0         |
 
 ## Installation
 

data/db/migrate/20260617091723_remove_rescue_pxegrub_setting.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class RemoveRescuePxegrubSetting < ActiveRecord::Migration[7.0]
+  class MigrationSettings < ApplicationRecord
+    self.table_name = :settings
+  end
+
+  def up
+    MigrationSettings.where(name: 'rescue_pxegrub_tftp_template').delete_all
+  end
+
+  def down
+    # no-op: the setting is re-created by plugin registration on boot if re-added
+  end
+end

data/lib/foreman_rescue/engine.rb

@@ -4,9 +4,6 @@ module ForemanRescue
   class Engine < ::Rails::Engine
     engine_name 'foreman_rescue'
 
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-
     # Add any db migrations
     initializer 'foreman_rescue.load_app_instance_data' do |app|
       ForemanRescue::Engine.paths['db/migrate'].existent.each do |path|
@@ -14,38 +11,33 @@ module ForemanRescue
       end
     end
 
-    initializer 'foreman_rescue.register_plugin', :before => :finisher_hook do |_app| # rubocop:disable Metrics/BlockLength
-      Foreman::Plugin.register :foreman_rescue do # rubocop:disable Metrics/BlockLength
-        requires_foreman '>= 3.9'
-
-        settings do
-          category :rescue, N_('Rescue') do
-            setting('rescue_pxelinux_tftp_template',
-              type: :string,
-              default: 'Kickstart rescue PXELinux',
-              full_name: N_('PXELinux rescue template'),
-              description: N_('PXELinux template used when booting rescue system'),
-              collection: proc { ProvisioningTemplate.templates_by_kind('PXELinux') })
+    initializer 'foreman_rescue.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        Foreman::Plugin.register :foreman_rescue do
+          requires_foreman '>= 3.13'
 
-            setting('rescue_pxegrub_tftp_template',
-              type: :string,
-              default: '',
-              full_name: N_('PXEGrub rescue template'),
-              description: N_('PXEGrub template used when booting rescue system'),
-              collection: proc { ProvisioningTemplate.templates_by_kind('PXEGrub') })
+          settings do
+            category :rescue, N_('Rescue') do
+              setting('rescue_pxelinux_tftp_template',
+                type: :string,
+                default: 'Kickstart rescue PXELinux',
+                full_name: N_('PXELinux rescue template'),
+                description: N_('PXELinux template used when booting rescue system'),
+                collection: proc { ProvisioningTemplate.templates_by_kind('PXELinux') })
 
-            setting('rescue_pxegrub2_tftp_template',
-              type: :string,
-              default: '',
-              full_name: N_('PXEGrub2 rescue template'),
-              description: N_('PXEGrub2 template used when booting rescue system'),
-              collection: proc { ProvisioningTemplate.templates_by_kind('PXEGrub2') })
+              setting('rescue_pxegrub2_tftp_template',
+                type: :string,
+                default: '',
+                full_name: N_('PXEGrub2 rescue template'),
+                description: N_('PXEGrub2 template used when booting rescue system'),
+                collection: proc { ProvisioningTemplate.templates_by_kind('PXEGrub2') })
+            end
           end
-        end
 
-        # Add permissions
-        security_block :foreman_rescue do
-          permission :rescue_hosts, :'foreman_rescue/hosts' => [:rescue, :set_rescue, :cancel_rescue]
+          # Add permissions
+          security_block :foreman_rescue do
+            permission :rescue_hosts, :'foreman_rescue/hosts' => [:rescue, :set_rescue, :cancel_rescue]
+          end
         end
       end
     end

data/lib/foreman_rescue/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanRescue
-  VERSION = '4.0.1'
+  VERSION = '5.1.0'
 end

data/test/models/host_test.rb

@@ -51,12 +51,21 @@ class HostTest < ActiveSupport::TestCase
         tasks = host.queue.all.map(&:name)
         assert_includes tasks, "Deploy TFTP PXEGrub2 config for #{host}"
         assert_includes tasks, "Deploy TFTP PXELinux config for #{host}"
-        assert_includes tasks, "Deploy TFTP PXEGrub config for #{host}"
       end
 
       test 'should deploy rescue template' do
         Setting['rescue_pxelinux_tftp_template'] = template.name
-        ProxyAPI::TFTP.any_instance.expects(:set).with('PXELinux', host.mac, :pxeconfig => template.template).once
+        version = Foreman::Version.new
+        if version.major.to_i == 3 && version.minor.to_i <= 13
+          ProxyAPI::TFTP.any_instance.expects(:set).with('PXELinux', host.mac, :pxeconfig => template.template).once
+        else
+          ProxyAPI::TFTP.any_instance.expects(:set).with('PXELinux', host.mac, { :pxeconfig => template.template,
+                                                                                 :targetos => os.name.downcase.to_s,
+                                                                                 :release => host.operatingsystem.release,
+                                                                                 :arch => host.arch.name,
+                                                                                 :bootfile_suffix => host.arch.bootfilename_efi }).once
+
+        end
         host.stubs(:skip_orchestration?).returns(false) # Enable orchestration
         assert host.save
       end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rescue
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.1.0
 platform: ruby
 authors:
 - Timo Goebel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,6 +57,7 @@ files:
 - config/routes.rb
 - db/migrate/20170901131321_add_rescue_mode_to_host.foreman_rescue.rb
 - db/migrate/20240506132712_migrate_rescue_settings_category_to_dsl.rb
+- db/migrate/20260617091723_remove_rescue_pxegrub_setting.rb
 - db/seeds.d/103-provisioning_templates.rb
 - lib/foreman_rescue.rb
 - lib/foreman_rescue/engine.rb
@@ -78,7 +78,6 @@ homepage: https://github.com/dm-drogeriemarkt/foreman_rescue
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Provides the ability to boot a host into a rescue system.
 test_files: