foreman_bootdisk 10.0.1 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 650c3fef3d65bf931b5b55742b6edf13ab569b85
-  data.tar.gz: 5ba2e8581df468982cea40b986fbfe2e659b2832
+SHA256:
+  metadata.gz: 8e1f729480f6663624d1fb96b994a381e9926c1d99f7239d02fca9a376d6ccaa
+  data.tar.gz: e94de3dd4d1dd78abac381ca057e6da44a42e0a5f9b5afbd493c29ce6310861a
 SHA512:
-  metadata.gz: 6281f104fa4b4bd26517485a3c597fb428ddbfb6900e15116b9ecf69f488c1f1e46cc95261829afcd7031ad4d6cc169760c315a7a2b1097d63706dc5b5bd0e46
-  data.tar.gz: 29bfcedcadee57b04a791c064ebe1fa56327f0cdd54ec96578b2eacd899540dc737472dadea02a4aa34aa8582aef5a26bec7722a8a169864eb4e84eda4a7ddda
+  metadata.gz: 15348dcc0e22146f014239eae49e90a0e4fd95050d44c42cab4ee461e165ea63f407b797c70001c49180d36c0fef47ca166aa01e26253d08ca2412b3cbeac7b0
+  data.tar.gz: b3f5b11e82ed73e2d0c7373f61af61fd1b861c45e2399b02e010399d24139d89ded5ecaae5663d17b19fec370e9ccec592e3dff2734f2431c9f493291ad965a5

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v10.0.2
+* bootdisk_raise template marco works in preview mode (#22136)
+* host image works with subnet without gateway (#21106)
+
 ## v10.0.1
 * Fix rake tasks are Taxonomy and User aware (#21877)
 * Revert alias_method_chain with Module#prepend for Katello 3.4 compatibility

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

@@ -21,10 +21,6 @@ module ForemanBootdisk::HostExt
     ForemanBootdisk::Renderer.format_bootdisk_chain_url(foreman_url(action), mac)
   end
 
-  def bootdisk_raise(*args)
-    raise ::Foreman::Exception.new(*args)
-  end
-
   def bootdisk_build?
     provision_method == 'bootdisk'
   end

data/app/services/foreman_bootdisk/renderer_methods.rb

@@ -15,5 +15,9 @@ module ForemanBootdisk
     def bootdisk_chain_url(mac = '', action = 'iPXE')
       self.class.format_bootdisk_chain_url(foreman_url(action), mac)
     end
+
+    def bootdisk_raise(*args)
+      raise ::Foreman::Exception.new(*args)
+    end
   end
 end

data/app/views/foreman_bootdisk/host.erb

@@ -10,8 +10,6 @@ bootdisk_raise(N_('Host has no provisioning interface defined')) unless interfac
 bootdisk_raise(N_('Host has no IP address defined')) if interface.ip.nil? || interface.ip.empty?
 bootdisk_raise(N_('Host has no subnet defined')) unless interface.subnet
 bootdisk_raise(N_('Host has no domain defined')) unless interface.domain
-bootdisk_raise(N_('Subnet (%s) has no gateway defined'), interface.subnet) if interface.subnet.gateway.nil? || interface.subnet.gateway.empty?
-bootdisk_raise(N_('Subnet (%s) has no primary DNS server defined'), interface.subnet) if interface.subnet.dns_primary.nil? || interface.subnet.dns_primary.empty?
 %>
 
 echo Foreman Bootdisk: Host image (<%= @host.name %>)
@@ -31,14 +29,18 @@ echo Configuring net${idx} for static IP address <%= interface.ip %>
 ifopen net${idx}
 set netX/ip <%= interface.ip %>
 set netX/netmask <%= interface.subnet.mask %>
+<% if interface.subnet.gateway.present? %>
 set netX/gateway <%= interface.subnet.gateway %>
+<% end %>
 ifstat net${idx}
 route
 
+<% if interface.subnet.dns_primary.present? %>
 # Note, iPXE can only use one DNS server
 echo Using DNS <%= interface.subnet.dns_primary %>
 set dns <%= interface.subnet.dns_primary %>
 set domain <%= interface.domain.to_s %>
+<% end %>
 
 # Chainload from Foreman rather than embedding OS info here, so the behaviour
 # is entirely dynamic.

data/lib/foreman_bootdisk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.0.2
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-01-08 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.
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman