foreman_bootdisk 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dbe2e8426146b25ce78dea249b33ba9f35293b1
-  data.tar.gz: 0741b50ad7795889f4f694687c25fef87f1c39fa
+  metadata.gz: e51cb397e2135c07a5e7d3964e190cefe4852e04
+  data.tar.gz: db451601c84e35db1492de7a5246fd4f8143c920
 SHA512:
-  metadata.gz: c8c7dd29e0e76766b8408a1611bf5c7a5d18d54adb7fa4961929f8d642418a853b271c85d2b3c2db69179f053c4b29ddad10aae05a8b5dd3f4cd5f8c42653e2b
-  data.tar.gz: 99eabe8b84e51cb47ca8a7503a2d2663c92d6a27ea7409116ed3594c5a1f0cc62165d8d01d98275c43d4e81cff30992214e32ccaf7f99f259bbd411446122734
+  metadata.gz: 7c750aeff74a5fb650288c67f540227ccaa765ef0544402fdf912de87fb9123fae5a547bf542a53171b25a1b68cb38692a070732fc6106cd2a4dea3b6c71d5dc
+  data.tar.gz: 72b036286e3d93af852e05fc2c5c56430037ecb50b15cba5b6d44ddfcf5274cf09cda537d19093305e1c68426fd7722396c24435423cd1ada301c48100cab631

data/CHANGES.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v2.0.5
+* safemode compatibility under Foreman 1.5
+
 ## v2.0.4
 * fix Foreman 1.5 host show page compatibility
 * updates to README

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

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Bootdisk::HostExt
   extend ActiveSupport::Concerns
 
@@ -6,10 +8,22 @@ module Bootdisk::HostExt
   end
 
   def bootdisk_template_render
-    # Waiting on additional whitelisted items, #2948
-    Setting[:safemode_render] && raise(::Foreman::Exception.new(N_('Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings')))
+    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
 
     @host = self
     pxe_render(bootdisk_template.template)
   end
+
+  def bootdisk_chain_url(mac = self.mac, action = 'iPXE')
+    u = URI.parse(foreman_url(action))
+    u.query = "#{u.query}&mac=#{mac}"
+    u.fragment = nil
+    u.to_s
+  end
+
+  def bootdisk_raise(*args)
+    raise ::Foreman::Exception.new(*args)
+  end
 end

data/app/services/bootdisk/renderer.rb

@@ -1,15 +1,25 @@
+require 'uri'
+
 module Bootdisk
   class Renderer
     include ::Foreman::Renderer
     include Rails.application.routes.url_helpers
 
     def generic_template_render
-      # Waiting on additional whitelisted items, #2948
-      Setting[:safemode_render] && raise(::Foreman::Exception.new(N_('Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings')))
+      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'))
       @host = Struct.new(:token).new(nil)
       unattended_render(tmpl.template)
     end
+
+    def bootdisk_chain_url(action = 'iPXE')
+      u = URI.parse(foreman_url(action))
+      u.query = "#{u.query}&mac="
+      u.fragment = nil
+      u.to_s
+    end
   end
 end

data/app/views/bootdisk/generic_host.erb

@@ -15,7 +15,7 @@
 isset ${net<%= i -%>/mac} || goto no_nic
 echo net<%= i -%> is a ${net<%= i -%>/chip} with MAC ${net<%= i -%>/mac}
 dhcp net<%= i %> || goto net<%= i+1 %>
-chain <%= (u = URI.parse(foreman_url("iPXE")); u.query = "#{u.query}&mac="; u.to_s) %>${net<%= i -%>/mac} || goto net<%= i+1 %>
+chain <%= bootdisk_chain_url %>${net<%= i -%>/mac} || goto net<%= i+1 %>
 exit 0
 <% end -%>
 

data/app/views/bootdisk/host.erb

@@ -5,11 +5,11 @@
 # Copy this template to customize it, the original is read-only.
 
 <%
-raise ::Foreman::Exception.new(N_('Host has no IP address defined')) if @host.ip.empty?
-raise ::Foreman::Exception.new(N_('Host has no subnet defined')) if @host.subnet.nil?
-raise ::Foreman::Exception.new(N_('Host has no domain defined')) if @host.domain.nil?
-raise ::Foreman::Exception.new(N_('Subnet (%s) has no gateway defined'), @host.subnet) if @host.subnet.gateway.empty?
-raise ::Foreman::Exception.new(N_('Subnet (%s) has no primary DNS server defined'), @host.subnet) if @host.subnet.dns_primary.empty?
+bootdisk_raise(N_('Host has no IP address defined')) if @host.ip.empty?
+bootdisk_raise(N_('Host has no subnet defined')) unless @host.subnet
+bootdisk_raise(N_('Host has no domain defined')) unless @host.domain
+bootdisk_raise(N_('Subnet (%s) has no gateway defined'), @host.subnet) if @host.subnet.gateway.empty?
+bootdisk_raise(N_('Subnet (%s) has no primary DNS server defined'), @host.subnet) if @host.subnet.dns_primary.empty?
 %>
 
 # loop over net* until the host's MAC matches
@@ -37,7 +37,7 @@ set domain <%= @host.domain.to_s %>
 
 # Chainload from Foreman rather than embedding OS info here, so the behaviour
 # is entirely dynamic.
-chain <%= (u = URI.parse(foreman_url("iPXE")); u.query ="#{u.query}&mac=#{@host.mac}"; u.to_s) %>
+chain <%= bootdisk_chain_url %>
 exit 0
 
 :no_nic

data/lib/bootdisk/engine.rb

@@ -28,6 +28,8 @@ module Bootdisk
         end
 
         role "Boot disk access", [:download_bootdisk] unless (Role.count rescue nil).nil?
+
+        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise if respond_to? :allowed_template_helpers
       end
     end
 

data/lib/bootdisk/version.rb

@@ -1,3 +1,3 @@
 module Bootdisk
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-05-02 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.