foreman_bootdisk 11.0.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7090fb0dd77db85fc9aa172b0a785f2d97c37a3dc5597a689a5c79fd7fbd0f2a
-  data.tar.gz: d35862a0f641367cc7bfd1fa95a801e0ab5afd056b19995fa6f05aae97bf4bdd
+  metadata.gz: 208b518a4b2d0978e4ef072aab241305e16b327e4709f6bad1cfee39ffc7b85a
+  data.tar.gz: 758b6cba3dbeef8c95862aac8b4ded56c25e4d52224e15d962c538502baaec96
 SHA512:
-  metadata.gz: c7c3a1e1f5e951b2252087d2064c9886a779a08c96a4c52d15c5d7711a542d5c9195e96bd86aecf2d82f780b633f11680c91368304d7874e8130b181e0f1606f
-  data.tar.gz: 278854b3bcfbd844c72d0c817e1479d47a47125f95f47cb2b08b7dc257f0ece53f73070296681952c7bfeced060329e30033bf021a371420727b3b942461fb92
+  metadata.gz: 98b20bf6e7304aeae69d1bc5244681fea14b2d60e8d4ab32e0f6990c5f47c9985d96d1d1491188336a84ba42d25629ce3cfe74f0cbe6e6b4a0c5525fdd8e5e21
+  data.tar.gz: eb3b37f7b7846aeb5d4179fe5f0bb74183aa48376494c6dcf9aad05d8f8dd7767b38d5ebda1cbf7d9c2479fe8b5e4957a9df74b9d440ff46c8da4e482af535e0

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v12.0.0
+* fixed subnet image token stub (#22428)
+* moved MAC based identification to Foreman core (#22858)
+* bootdisk_raise fixed for host context (#22482)
+* fixed nil exception with PXELinux template (#23267)
+
 ## v11.0.0
 * bootdisk_raise template marco works in preview mode (#22136)
 * host image works with subnet without gateway (#21106)

data/README.md

@@ -46,6 +46,7 @@ gPXE images are unsupported due to lack of initrd support.
 | >= 1.13         | ~> 9.0         |
 | >= 1.15         | ~> 10.0        |
 | >= 1.17         | ~> 11.0        |
+| >= 1.18         | ~> 12.0        |
 
 # Usage
 

data/app/models/concerns/foreman_bootdisk/host_ext.rb

@@ -10,10 +10,6 @@ module ForemanBootdisk::HostExt
     unattended_render(bootdisk_template.template)
   end
 
-  def bootdisk_chain_url(mac = self.mac, action = 'iPXE')
-    ForemanBootdisk::Renderer.format_bootdisk_chain_url(foreman_url(action), mac)
-  end
-
   def bootdisk_build?
     provision_method == 'bootdisk'
   end

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -11,7 +11,10 @@ class ForemanBootdisk::ISOGenerator
     raise ::Foreman::Exception.new(N_('Host is not in build mode, so the template cannot be rendered')) unless host.build?
 
     tmpl = host.send(:generate_pxe_template, :PXELinux)
-    raise ::Foreman::Exception.new(N_('Unable to generate disk template: %s'), host.errors.full_messages.to_sentence) if tmpl == false
+    unless tmpl
+      err = host.errors.full_messages.to_sentence
+      raise ::Foreman::Exception.new(N_('Unable to generate disk template, PXELinux template not found or: %s'), err)
+    end
 
     # pxe_files and filename conversion is utterly bizarre
     # aim to convert filenames to something usable under ISO 9660, update the template to match

data/app/services/foreman_bootdisk/renderer.rb

@@ -13,9 +13,9 @@ module ForemanBootdisk
       if subnet.present?
         # rendering a subnet-level bootdisk requires tricking the renderer into thinking it has a
         # valid host, with a token, and with a tftp proxy
-        @host = Struct.new(:token, :subnet).new(
+        @host = Struct.new(:token, :provision_interface).new(
           Struct.new(:value).new('faketoken'),
-          subnet
+          Struct.new(:subnet).new(subnet)
         )
       else
         @host = Struct.new(:token, :subnet).new(nil,nil)

data/app/services/foreman_bootdisk/renderer_methods.rb

@@ -10,14 +10,18 @@ module ForemanBootdisk
         u.fragment = nil
         u.to_s
       end
+
+      def bootdisk_raise(*args)
+        raise ::Foreman::Exception.new(*args)
+      end
     end
 
-    def bootdisk_chain_url(mac = '', action = 'iPXE')
+    def bootdisk_chain_url(mac = self.try(:mac), action = 'iPXE')
       self.class.format_bootdisk_chain_url(foreman_url(action), mac)
     end
 
     def bootdisk_raise(*args)
-      raise ::Foreman::Exception.new(*args)
+      self.class.bootdisk_raise(*args)
     end
   end
 end

data/lib/foreman_bootdisk/engine.rb

@@ -48,7 +48,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.17'
+        requires_foreman '>= 1.18'
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :subnet, :help],
@@ -77,9 +77,9 @@ module ForemanBootdisk
     config.to_prepare do
       begin
         Host::Managed.send(:prepend, ForemanBootdisk::HostExt)
+        Host::Managed.send(:include, ForemanBootdisk::RendererMethods)
         Host::Managed.send(:include, ForemanBootdisk::Orchestration::Compute) if SETTINGS[:unattended]
         HostsHelper.send(:prepend, ForemanBootdisk::HostsHelperExt)
-        UnattendedController.send(:prepend, ForemanBootdisk::UnattendedControllerExt)
         Foreman::Model::Vmware.send(:prepend, ForemanBootdisk::ComputeResources::Vmware) if Foreman::Model::Vmware.available?
       rescue => e
         puts "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '11.0.0'
+  VERSION = '12.0.0'
 end

data/locale/foreman_bootdisk.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_bootdisk 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-01 14:36-0500\n"
-"PO-Revision-Date: 2017-12-01 14:36-0500\n"
+"POT-Creation-Date: 2018-03-12 12:56-0400\n"
+"PO-Revision-Date: 2018-03-12 12:56-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -289,14 +289,6 @@ msgstr ""
 msgid "Host has no domain defined"
 msgstr ""
 
-#: ../app/views/foreman_bootdisk/host.erb:13
-msgid "Subnet (%s) has no gateway defined"
-msgstr ""
-
-#: ../app/views/foreman_bootdisk/host.erb:14
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr ""
-
 #: ../lib/foreman_bootdisk/engine.rb:65
 msgid "Boot disk based"
 msgstr ""

data/test/unit/iso_generator_test.rb

@@ -40,10 +40,9 @@ class ForemanBootdisk::IsoGeneratorTest < ActiveSupport::TestCase
   end
 
   test "full host image generation generates via PXELinux type" do
+    @host.expects(:generate_pxe_template).with(:PXELinux).returns("Template")
     @host.operatingsystem.expects(:pxe_files).returns([])
-    @host.operatingsystem.expects(:kernel).returns("kernel")
-    @host.operatingsystem.expects(:initrd).returns("initrd")
-    ForemanBootdisk::ISOGenerator.expects(:generate).with({:isolinux => nil, :files => []}, anything)
+    ForemanBootdisk::ISOGenerator.expects(:generate).with({:isolinux => "Template", :files => []}, anything)
     ForemanBootdisk::ISOGenerator.generate_full_host(@host)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 12.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
   without the need for PXE infrastructure.
@@ -25,7 +25,6 @@ files:
 - LICENSE
 - README.md
 - app/assets/javascripts/foreman_bootdisk/host_edit.js
-- app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb
 - app/controllers/foreman_bootdisk/api/v2/disks_controller.rb
 - app/controllers/foreman_bootdisk/api/v2/subnet_disks_controller.rb
 - app/controllers/foreman_bootdisk/disks_controller.rb
@@ -116,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman

data/app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb

@@ -1,6 +0,0 @@
-module ForemanBootdisk::UnattendedControllerExt
-  def find_host_by_ip_or_mac
-    request.env['HTTP_X_RHN_PROVISIONING_MAC_0'] = "unknown #{params['mac']}" unless request.env.has_key?('HTTP_X_RHN_PROVISIONING_MAC_0') || params['mac'].nil?
-    super
-  end
-end