foreman_bootdisk 10.0.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c86a63777cd84947eaaa64505cd6ab37910773
-  data.tar.gz: 6095c49c84e7c98a4addd7426e280ae33b6ed47a
+  metadata.gz: 650c3fef3d65bf931b5b55742b6edf13ab569b85
+  data.tar.gz: 5ba2e8581df468982cea40b986fbfe2e659b2832
 SHA512:
-  metadata.gz: 06ac35157d5df78c69f34e6cbeb79c89eb0c121341617adbbf504a569b1e9522cec3e540c0b49b3184a8225ede573286bd917e6626f1f00e91786acdbac45406
-  data.tar.gz: 4c90bda0e2f90075b3065e9eebb192bae0ea27f87bd95f830a5d21256d3267d481baac3a1e7060ef2bdbcd41f22f72690dc726660fec68476931c0652750f11b
+  metadata.gz: 6281f104fa4b4bd26517485a3c597fb428ddbfb6900e15116b9ecf69f488c1f1e46cc95261829afcd7031ad4d6cc169760c315a7a2b1097d63706dc5b5bd0e46
+  data.tar.gz: 29bfcedcadee57b04a791c064ebe1fa56327f0cdd54ec96578b2eacd899540dc737472dadea02a4aa34aa8582aef5a26bec7722a8a169864eb4e84eda4a7ddda

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v10.0.1
+* Fix rake tasks are Taxonomy and User aware (#21877)
+* Revert alias_method_chain with Module#prepend for Katello 3.4 compatibility
+
 ## v10.0.0
 * retry vmware iso boot 10 times before giving up (#19013)
 * fix duplicate template creation during database seeding (#19733)

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

@@ -1,6 +1,12 @@
 module ForemanBootdisk::UnattendedControllerExt
-  def find_host_by_ip_or_mac
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method_chain :find_host_by_ip_or_mac, :param_mac
+  end
+
+  def find_host_by_ip_or_mac_with_param_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
+    find_host_by_ip_or_mac_without_param_mac
   end
 end

data/app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -1,5 +1,11 @@
 module ForemanBootdisk::HostsHelperExt
-  def host_title_actions(*args)
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method_chain :host_title_actions, :bootdisk
+  end
+
+  def host_title_actions_with_bootdisk(*args)
     if @host.bootdisk_downloadable?
       title_actions(
         button_group(
@@ -18,7 +24,7 @@ module ForemanBootdisk::HostsHelperExt
       bootdisk_button_disabled
     end
 
-    super
+    host_title_actions_without_bootdisk(*args)
   end
 
   def bootdisk_button_disabled

data/app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb

@@ -1,12 +1,19 @@
 module ForemanBootdisk
   module ComputeResources
     module Vmware
-      def capabilities
-        super + [:bootdisk]
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :capabilities, :bootdisk
+        alias_method_chain :parse_args, :bootdisk
+      end
+
+      def capabilities_with_bootdisk
+        capabilities_without_bootdisk + [:bootdisk]
       end
 
-      def parse_args(args = {})
-        args = super
+      def parse_args_with_bootdisk(args = {})
+        args = parse_args_without_bootdisk args
         if args[:provision_method] == 'bootdisk'
           args[:cdroms] = [new_cdrom]
           args[:boot_order] = ['cdrom', 'disk']

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

@@ -1,8 +1,15 @@
 require 'uri'
 
 module ForemanBootdisk::HostExt
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method_chain :validate_media?, :bootdisk
+    alias_method_chain :can_be_built?, :bootdisk
+  end
+
   def bootdisk_template
-    ProvisioningTemplate.find_by_name(Setting[:bootdisk_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_host_template'))
+    ProvisioningTemplate.unscoped.find_by_name(Setting[:bootdisk_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_host_template'))
   end
 
   def bootdisk_template_render
@@ -34,11 +41,11 @@ module ForemanBootdisk::HostExt
     /i.86|x86[_-]64/ =~ architecture.name
   end
 
-  def validate_media?
-    super || (managed && bootdisk_build? && build?)
+  def validate_media_with_bootdisk?
+    validate_media_without_bootdisk? || (managed && bootdisk_build? && build?)
   end
 
-  def can_be_built?
-    super || (managed? and SETTINGS[:unattended] and bootdisk_build? and !build?)
+  def can_be_built_with_bootdisk?
+    can_be_built_without_bootdisk? || (managed? and SETTINGS[:unattended] and bootdisk_build? and !build?)
   end
 end

data/app/services/foreman_bootdisk/renderer.rb

@@ -8,7 +8,7 @@ module ForemanBootdisk
     include RendererMethods
 
     def generic_template_render(subnet = nil)
-      tmpl = ProvisioningTemplate.find_by_name(Setting[:bootdisk_generic_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_generic_host_template'))
+      tmpl = ProvisioningTemplate.unscoped.find_by_name(Setting[:bootdisk_generic_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_generic_host_template'))
 
       if subnet.present?
         # rendering a subnet-level bootdisk requires tricking the renderer into thinking it has a

data/lib/foreman_bootdisk/engine.rb

@@ -76,11 +76,11 @@ module ForemanBootdisk
 
     config.to_prepare do
       begin
-        Host::Managed.send(:prepend, ForemanBootdisk::HostExt)
+        Host::Managed.send(:include, ForemanBootdisk::HostExt)
         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?
+        HostsHelper.send(:include, ForemanBootdisk::HostsHelperExt)
+        UnattendedController.send(:include, ForemanBootdisk::UnattendedControllerExt)
+        Foreman::Model::Vmware.send(:include, ForemanBootdisk::ComputeResources::Vmware) if Foreman::Model::Vmware.available?
       rescue => e
         puts "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"
       end

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '10.0.0'
+  VERSION = '10.0.1'
 end

data/lib/tasks/bootdisk.rake

@@ -16,46 +16,54 @@ namespace :bootdisk do
   namespace :generate do
     desc 'Generate a static boot disk for a specific host.  NAME=fqdn, OUTPUT path'
     task :host => :environment do
-      host = Host::Base.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
-      tmpl = host.bootdisk_template_render
+      User.as_anonymous_admin do
+        host = Host::Base.unscoped.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
+        tmpl = host.bootdisk_template_render
 
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
-        output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}.iso")
-        FileUtils.mv image, output
-        puts "Wrote #{output}"
+        ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+          output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}.iso")
+          FileUtils.mv image, output
+          puts "Wrote #{output}"
+        end
       end
     end
 
     desc 'Generate a full boot disk for a specific host with the OS bootloader included.  NAME=fqdn, OUTPUT path'
     task :full_host => :environment do
-      host = Host::Base.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
-      ForemanBootdisk::ISOGenerator.generate_full_host(host, :dir => outputdir) do |image|
-        output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}_#{Date.today.strftime('%Y%m%d')}.iso")
-        FileUtils.cp image, output
-        puts "Wrote #{output}"
+      User.as_anonymous_admin do
+        host = Host::Base.unscoped.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
+        ForemanBootdisk::ISOGenerator.generate_full_host(host, :dir => outputdir) do |image|
+          output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}_#{Date.today.strftime('%Y%m%d')}.iso")
+          FileUtils.cp image, output
+          puts "Wrote #{output}"
+        end
       end
     end
 
     desc 'Generate a generic boot disk.  OUTPUT=path'
     task :generic => :environment do
-      tmpl = ForemanBootdisk::Renderer.new.generic_template_render
+      User.as_anonymous_admin do
+        tmpl = ForemanBootdisk::Renderer.new.generic_template_render
 
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
-        output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso")
-        FileUtils.cp image, output
-        puts "Wrote #{output}"
+        ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+          output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso")
+          FileUtils.cp image, output
+          puts "Wrote #{output}"
+        end
       end
     end
 
     desc 'Generate a subnet disk for a specific subnet. NAME=subnet, OUTPUT=path'
     task :subnet => :environment do
-      subnet = Subnet.find_by_name(ENV['NAME']) || raise("cannot find subnet '#{ENV['NAME']}', specify NAME=subnet")
-      subnet.tftp || raise(::Foreman::Exception.new(N_("TFTP feature not enabled for subnet %s"), subnet.name))
-      tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
-        output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_subnet_#{subnet.name}.iso")
-        FileUtils.cp image, output
-        puts "Wrote #{output}"
+      User.as_anonymous_admin do
+        subnet = Subnet.unscoped.find_by_name(ENV['NAME']) || raise("cannot find subnet '#{ENV['NAME']}', specify NAME=subnet")
+        subnet.tftp || raise(::Foreman::Exception.new(N_("TFTP feature not enabled for subnet %s"), subnet.name))
+        tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
+        ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+          output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_subnet_#{subnet.name}.iso")
+          FileUtils.cp image, output
+          puts "Wrote #{output}"
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.1
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-06 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.