foreman_bootdisk 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adbc8a5cad8e57bb7a872e5091de1d0be8848603
-  data.tar.gz: 6078ba730289b9857097df49467149fac0c254ef
+  metadata.gz: ffdf260d555ad64c9c24397f293902ab11750afe
+  data.tar.gz: 737a352d301347d4cf8a7549822e7e1b0cb5ae95
 SHA512:
-  metadata.gz: f50b764848cec817cdeaa0121f15e22f0963f93367734572d20a0c21e02afb2b0a99527d9f72a831b29400c5ed639d3d5f72b5e95cd4bc83e5623e915b389f84
-  data.tar.gz: e13b29571fe76e38ba1c82f9b68f7def33e11c0838b95978871856b585a95c1c7ff80c2cbfd1f6a901852a88addb91b23016ce0d575d3c141674dac7cdfed11f
+  metadata.gz: 51d13826e62222446b190c2d031f24a9cbd360f8e3e8f7aab0024b2b392edafd1b56a01c6f000594581cef58c8e8fed27e529fdb434ca737f5d91c5afc7e01e0
+  data.tar.gz: d3c6946fe6fbdede2d47edeb0844dbbc3625bf46ad1e7dfdf07e4aa695967de44d70aef37dc8ad7f1dfbe635fdfb4ffc5a7eb1ed00b3f6481940316349db222d

data/CHANGES.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v6.0.0
+* compatibility with Foreman 1.9 template changes (#10773)
+* generate correct links under sub-URI (#10494)
+* fix tests on Foreman 1.9
+* remove old compatibility warning
+* requires Foreman 1.9+
+
 ## v5.0.0
 * configure host provisioning interface in host ISO, not primary
 * syslinux v6 compatibility, include ldlinux.c32

data/README.md

@@ -40,6 +40,7 @@ gPXE images are unsupported due to lack of initrd support.
 | >= 1.6          | ~> 3.0         |
 | >= 1.7          | ~> 4.0         |
 | >= 1.8          | ~> 5.0         |
+| >= 1.9          | ~> 6.0         |
 
 # Usage
 

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

@@ -29,7 +29,7 @@ module ForemanBootdisk::HostsHelperExt
   end
 
   def bootdisk_url(options)
-    ForemanBootdisk::Engine.routes.url_for(options.merge(:only_path => true))
+    ForemanBootdisk::Engine.routes.url_for(options.merge(:only_path => true, :script_name => foreman_bootdisk_path))
   end
 
   def bootdisk_authorized_for(options)

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

@@ -4,7 +4,7 @@ module ForemanBootdisk::HostExt
   extend ActiveSupport::Concerns
 
   def bootdisk_template
-    ConfigTemplate.find_by_name(Setting[:bootdisk_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_host_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'))
   end
 
   def bootdisk_template_render

data/app/services/foreman_bootdisk/renderer.rb

@@ -6,11 +6,7 @@ module ForemanBootdisk
     include Rails.application.routes.url_helpers
 
     def generic_template_render
-      if (Gem::Version.new(SETTINGS[:version].notag) < Gem::Version.new('1.5')) && Setting[:safemode_render]
-        raise(::Foreman::Exception.new(N_('Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings')))
-      end
-
-      tmpl = ConfigTemplate.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.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'))
       @host = Struct.new(:token, :subnet).new(nil, nil)
       unattended_render(tmpl.template)
     end

data/db/migrate/20140522185700_change_templatekind_to_bootdisk.rb

@@ -1,12 +1,20 @@
 class ChangeTemplatekindToBootdisk < ActiveRecord::Migration
+  class FakeConfigTemplate < ActiveRecord::Base
+    if ActiveRecord::Migrator.get_all_versions.include?(20150514072626)
+      self.table_name = 'templates'
+    else
+      self.table_name = 'config_templates'
+    end
+  end
+
   def self.up
     kind = TemplateKind.find_or_create_by_name('Bootdisk')
 
     tmpl_h = Setting.find_by_name('bootdisk_host_template').try(:value)
     tmpl_g = Setting.find_by_name('bootdisk_generic_host_template').try(:value)
 
-    (ConfigTemplate.unscoped.where('name LIKE ?', '%Boot disk%') |
-      ConfigTemplate.unscoped.where(:name => [tmpl_h, tmpl_g].compact)).each do |tmpl|
+    (FakeConfigTemplate.unscoped.where('name LIKE ?', '%Boot disk%') |
+      FakeConfigTemplate.unscoped.where(:name => [tmpl_h, tmpl_g].compact)).each do |tmpl|
       tmpl.update_attribute(:template_kind_id, kind.id)
     end
   end
@@ -15,7 +23,7 @@ class ChangeTemplatekindToBootdisk < ActiveRecord::Migration
     old_kind = TemplateKind.find_by_name('Bootdisk')
     new_kind = TemplateKind.find_by_name('iPXE')
     if old_kind.present? && new_kind.present?
-      ConfigTemplate.unscoped.where(:template_kind_id => old_kind.id).update_all(:template_kind_id => new_kind.id)
+      FakeConfigTemplate.unscoped.where(:template_kind_id => old_kind.id).update_all(:template_kind_id => new_kind.id)
     end
   end
 end

data/db/seeds.d/50-bootdisk_templates.rb

@@ -1,8 +1,8 @@
 kind = TemplateKind.find_or_create_by_name('Bootdisk')
 
-ConfigTemplate.without_auditing do
+ProvisioningTemplate.without_auditing do
   content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'host.erb'))
-  tmpl = ConfigTemplate.find_or_create_by_name(
+  tmpl = ProvisioningTemplate.find_or_create_by_name(
     :name => 'Boot disk iPXE - host',
     :template_kind_id => kind.id,
     :snippet => false,
@@ -17,7 +17,7 @@ ConfigTemplate.without_auditing do
   tmpl.save!(:validate => false) if tmpl.changes.present?
 
   content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'generic_host.erb'))
-  tmpl = ConfigTemplate.find_or_create_by_name(
+  tmpl = ProvisioningTemplate.find_or_create_by_name(
     :name => 'Boot disk iPXE - generic host',
     :template_kind_id => kind.id,
     :snippet => false,

data/lib/foreman_bootdisk/engine.rb

@@ -28,7 +28,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.8'
+        requires_foreman '>= 1.9'
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :help],

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '5.0.0'
+  VERSION = '6.0.0'
 end

data/test/test_plugin_helper.rb

@@ -21,7 +21,8 @@ class ActionController::TestCase
 
   def setup_host
     disable_orchestration
-    subnet = FactoryGirl.create(:subnet, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8')
-    @host = FactoryGirl.create(:host, :managed, :subnet => subnet, :ip => subnet.network.sub(/0$/, '4'))
+    org, loc = FactoryGirl.create(:organization), FactoryGirl.create(:location)
+    subnet = FactoryGirl.create(:subnet, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8', :organizations => [org], :locations => [loc])
+    @host = FactoryGirl.create(:host, :managed, :subnet => subnet, :ip => subnet.network.sub(/0$/, '4'), :organization => org, :location => loc)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-06-15 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.