foreman_rescue 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fed912b0085c3e6ab01cca79cc2e8df1986b71b8be95449caefa27a461d0ae50
-  data.tar.gz: 4f9c97ca7d406a58492bc8ac00f4b813dd009faddd857940abdda9275cce0942
+  metadata.gz: 1709ec2eb0238edc6b519747e90f282143a0ef2c4295007789ca8dd2cc0595e7
+  data.tar.gz: 3cc1c58fb18652286af8f3c1180fab872baec1922b8511c8137a4de2da591a8c
 SHA512:
-  metadata.gz: 589d947221c47ccca4d6d5ff1e7ad2f9beba1472a597c91017512ea3b82f97b7ba59e15e45eb6cf4aea3c884ff0df01510cd822ec1ed7fde423e5c6861b34ce6
-  data.tar.gz: 74308ab3113c2586326fac9e818c2f5a8871e1d0ad1354a21e8ecb88e2aa4c012360ce4c8b1645dac4ec86d9a59d771763c741b1eaecaee39f2f396663a43d78
+  metadata.gz: b1f3589dbecaa1643690057abc0a9302e3ebe3637d408a760c14e9739a1f7ac9842b08bfb5b896a0f9ef3e6bae61cbd2bf3925b8739639cafcc59f75a053ab0d
+  data.tar.gz: 14457ed5eb8cf325dd6fe9abf915f03765312e8be66f90d7824dea071c761c5e7a99cacfeccfa78de508b9fcb961fe56e4f617307b9a1d25c5fbb0696a0c4570

data/README.md

@@ -8,6 +8,7 @@ This plugin allows a user to boot a Foreman host into a rescue system via PXE.
 | --------------- | -------------- |
 | >= 1.15         | ~> 0.1         |
 | >= 1.17         | ~> 1.0         |
+| >= 1.20         | ~> 2.0         |
 
 ## Installation
 

data/app/models/concerns/foreman_rescue/orchestration/tftp.rb

@@ -37,7 +37,7 @@ module ForemanRescue
         template_name = Setting["rescue_#{kind.downcase}_tftp_template"]
         template = ::ProvisioningTemplate.find_by(name: template_name)
         return if template.blank?
-        unattended_render template
+        host.render_template(template: template)
       rescue StandardError => e
         failure _("Unable to render %{kind} rescue template '%{name}' for TFTP: %{e}") % { :kind => kind, :name => template.try(:name), :e => e }, e
       end

data/app/models/setting/rescue.rb

@@ -1,18 +1,20 @@
 class Setting
   class Rescue < ::Setting
+    BLANK_ATTRS.concat ['rescue_pxegrub_tftp_template', 'rescue_pxegrub2_tftp_template']
+
     def self.default_settings
       [
         set('rescue_pxelinux_tftp_template',
             N_('PXELinux template used when booting rescue system'),
-            'create', N_('PXELinux rescue template'), nil,
+            'Kickstart rescue PXELinux', N_('PXELinux rescue template'), nil,
             :collection => proc { Setting::Rescue.templates('PXELinux') }),
         set('rescue_pxegrub_tftp_template',
             N_('PXEGrub template used when booting rescue system'),
-            'create', N_('PXEGrub rescue template'), nil,
+            '', N_('PXEGrub rescue template'), nil,
             :collection => proc { Setting::Rescue.templates('PXEGrub') }),
         set('rescue_pxegrub2_tftp_template',
             N_('PXEGrub2 template used when booting rescue system'),
-            'create', N_('PXEGrub2 rescue template'), nil,
+            '', N_('PXEGrub2 rescue template'), nil,
             :collection => proc { Setting::Rescue.templates('PXEGrub 2') })
       ]
     end

data/app/views/foreman/unattended/provisioning_templates/PXELinux/kickstart_rescue_pxelinux.erb

@@ -0,0 +1,70 @@
+<%#
+kind: PXELinux
+name: Kickstart rescue PXELinux
+model: ProvisioningTemplate
+oses:
+- CentOS
+- Fedora
+- RedHat
+-%>
+# This file was deployed via '<%= template_name %>' template
+
+<%
+  major = @host.operatingsystem.major.to_i
+  mac = @host.provision_interface.mac
+
+  # Tell Anaconda to perform network functions with boot interface
+  #  both current and legacy syntax provided
+  options = ["ksdevice=bootif", "ks.device=bootif"]
+  if mac
+    bootif = '00-' + mac.gsub(':', '-')
+    options.push("BOOTIF=#{bootif}")
+  end
+
+  # Tell Anaconda what to pass off to kickstart server
+  #  both current and legacy syntax provided
+  options.push("nomount", "lang=en_US", "keymap=us")
+
+  # handle non-DHCP environments (e.g. bootdisk)
+  subnet = @host.provision_interface.subnet
+  unless subnet.dhcp_boot_mode?
+    # static network configuration
+    ip = @host.provision_interface.ip
+    mask = subnet.mask
+    gw = subnet.gateway
+    dns = [subnet.dns_primary]
+    if subnet.dns_secondary != ''
+      dns.push(subnet.dns_secondary)
+    end
+    if (@host.operatingsystem.name.match(/Fedora/i) && major < 17) || major < 7
+      # old Anacoda found in Fedora 16 or RHEL 6 and older
+      dns_servers = dns.join(',')
+      options.push("ip=#{ip}", "netmask=#{mask}", "gateway=#{gw}", "dns=#{dns_servers}")
+    else
+      options.push("ip=#{ip}::#{gw}:#{mask}:::none")
+      dns.each { |server|
+        options.push("nameserver=#{server}")
+      }
+    end
+  end
+
+  # kickstart repository for LiveOS
+  options.push("method=#{@host.operatingsystem.medium_uri(@host)}")
+
+  if host_param('blacklist')
+    options.push("modprobe.blacklist=" + host_param('blacklist').gsub(' ', ''))
+  end
+
+  # Enable rescue mode
+  options.push('rescue')
+
+  ksoptions = options.join(' ')
+-%>
+
+TIMEOUT <%= host_param('loader_timeout') || 10 %>
+DEFAULT <%= template_name %>
+
+LABEL <%= template_name %>
+  KERNEL <%= @kernel %>
+  APPEND initrd=<%= @initrd %> <%= pxe_kernel_options %> <%= ksoptions %>
+  IPAPPEND 2

data/db/seeds.d/103-provisioning_templates.rb

@@ -0,0 +1,18 @@
+User.as_anonymous_admin do
+  templates = [
+    { :name => 'Kickstart rescue PXELinux', :source => 'PXELinux/kickstart_rescue_pxelinux.erb', :template_kind => TemplateKind.find_by(:name => 'PXELinux') }
+  ]
+
+  templates.each do |template|
+    template[:contents] = File.read(File.join(ForemanRescue::Engine.root, 'app/views/foreman/unattended/provisioning_templates', template[:source]))
+    ProvisioningTemplate.where(:name => template[:name]).first_or_create do |pt|
+      pt.vendor = 'ForemanRescue'
+      pt.default = true
+      pt.locked = true
+      pt.name = template[:name]
+      pt.template = template[:contents]
+      pt.template_kind = template[:template_kind] if template[:template_kind]
+      pt.snippet = template[:snippet] if template[:snippet]
+    end
+  end
+end

data/lib/foreman_rescue/engine.rb

@@ -25,7 +25,7 @@ module ForemanRescue
 
     initializer 'foreman_rescue.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rescue do
-        requires_foreman '>= 1.17'
+        requires_foreman '>= 1.20'
 
         # Add permissions
         security_block :foreman_rescue do
@@ -44,6 +44,12 @@ module ForemanRescue
       end
     end
 
+    rake_tasks do
+      Rake::Task['db:seed'].enhance do
+        ForemanOmaha::Engine.load_seed
+      end
+    end
+
     initializer 'foreman_rescue.register_gettext', after: :load_config_initializers do |_app|
       locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
       locale_domain = 'foreman_rescue'

data/lib/foreman_rescue/version.rb

@@ -1,3 +1,3 @@
 module ForemanRescue
-  VERSION = '1.0.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/test/controllers/hosts_controller_test.rb

@@ -36,7 +36,7 @@ module ForemanRescue
           put :set_rescue, params: { :id => host.name }, session: set_session_user
           assert_response :found
           assert_redirected_to hosts_path
-          assert_equal "Enabled #{host} for rescue system on next boot.", flash[:notice]
+          assert_equal "Enabled #{host} for rescue system on next boot.", flash[:success]
         end
 
         context 'when reboot is requested' do
@@ -51,7 +51,7 @@ module ForemanRescue
             put :set_rescue, params: { :id => host.name, :host => { :rescue_mode => '1' } }, session: set_session_user
             assert_response :found
             assert_redirected_to hosts_path
-            assert_equal "Enabled #{host} for reboot into rescue system.", flash[:notice]
+            assert_equal "Enabled #{host} for reboot into rescue system.", flash[:success]
           end
 
           test 'with failed reboot, the flash should inform it' do
@@ -60,7 +60,7 @@ module ForemanRescue
             host.power.reset
             assert_response :found
             assert_redirected_to hosts_path
-            assert_equal "Enabled #{host} for boot into rescue system on next boot, but failed to power cycle the host.", flash[:notice]
+            assert_equal "Enabled #{host} for boot into rescue system on next boot, but failed to power cycle the host.", flash[:success]
           end
 
           test 'reboot raised exception, the flash should inform it' do
@@ -68,7 +68,7 @@ module ForemanRescue
             put :set_rescue, params: { :id => host.name, :host => { :rescue_mode => '1' } }, session: set_session_user
             assert_response :found
             assert_redirected_to hosts_path
-            assert_equal "Enabled #{host} for rescue system on next boot.", flash[:notice]
+            assert_equal "Enabled #{host} for rescue system on next boot.", flash[:success]
           end
         end
       end
@@ -92,7 +92,7 @@ module ForemanRescue
           put :cancel_rescue, params: { :id => host.name }, session: set_session_user
           assert_response :found
           assert_redirected_to hosts_path
-          assert_equal "Canceled booting into rescue system for #{host}.", flash[:notice]
+          assert_equal "Canceled booting into rescue system for #{host}.", flash[:success]
         end
       end
 

data/test/lib/tasks/seeds_test.rb

@@ -0,0 +1,33 @@
+require 'test_plugin_helper'
+
+module ForemanRescue
+  class SeedsTest < ActiveSupport::TestCase
+    setup do
+      Foreman.stubs(:in_rake?).returns(true)
+    end
+
+    teardown do
+      User.current = nil
+    end
+
+    test 'seeds rescue provisioning templates' do
+      seed
+      assert ProvisioningTemplate.unscoped.where(:default => true).exists?
+      expected_template_names = ['Kickstart rescue PXELinux']
+
+      seeded_templates = ProvisioningTemplate.unscoped.where(:default => true, :vendor => 'ForemanRescue').pluck(:name)
+
+      expected_template_names.each do |template|
+        assert_includes seeded_templates, template
+      end
+    end
+
+    private
+
+    def seed
+      User.current = FactoryBot.build(:user, :admin => true,
+                                             :organizations => [], :locations => [])
+      load Rails.root.join('db', 'seeds.rb')
+    end
+  end
+end

data/test/models/host_test.rb

@@ -51,7 +51,6 @@ class HostTest < ActiveSupport::TestCase
         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}"
-        assert_equal 3, tasks.size
       end
 
       test 'should deploy rescue template' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rescue
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Timo Goebel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -53,9 +53,11 @@ files:
 - app/models/concerns/foreman_rescue/host_extensions.rb
 - app/models/concerns/foreman_rescue/orchestration/tftp.rb
 - app/models/setting/rescue.rb
+- app/views/foreman/unattended/provisioning_templates/PXELinux/kickstart_rescue_pxelinux.erb
 - app/views/foreman_rescue/hosts/rescue.html.erb
 - config/routes.rb
 - db/migrate/20170901131321_add_rescue_mode_to_host.foreman_rescue.rb
+- db/seeds.d/103-provisioning_templates.rb
 - lib/foreman_rescue.rb
 - lib/foreman_rescue/engine.rb
 - lib/foreman_rescue/version.rb
@@ -66,6 +68,7 @@ files:
 - locale/gemspec.rb
 - test/controllers/hosts_controller_test.rb
 - test/factories/host.rb
+- test/lib/tasks/seeds_test.rb
 - test/models/host_test.rb
 - test/test_plugin_helper.rb
 homepage: https://github.com/dm-drogeriemarkt/foreman_rescue
@@ -95,5 +98,6 @@ summary: Provides the ability to boot a host into a rescue system.
 test_files:
 - test/models/host_test.rb
 - test/factories/host.rb
+- test/lib/tasks/seeds_test.rb
 - test/test_plugin_helper.rb
 - test/controllers/hosts_controller_test.rb