foreman_bootdisk 10.0.1 → 10.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGES.md +4 -0
  3. data/app/models/concerns/foreman_bootdisk/host_ext.rb +0 -4
  4. data/app/services/foreman_bootdisk/renderer_methods.rb +4 -0
  5. data/app/views/foreman_bootdisk/host.erb +4 -2
  6. data/lib/foreman_bootdisk/version.rb +1 -1
  7. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 650c3fef3d65bf931b5b55742b6edf13ab569b85
4
- data.tar.gz: 5ba2e8581df468982cea40b986fbfe2e659b2832
2
+ SHA256:
3
+ metadata.gz: 8e1f729480f6663624d1fb96b994a381e9926c1d99f7239d02fca9a376d6ccaa
4
+ data.tar.gz: e94de3dd4d1dd78abac381ca057e6da44a42e0a5f9b5afbd493c29ce6310861a
5
5
  SHA512:
6
- metadata.gz: 6281f104fa4b4bd26517485a3c597fb428ddbfb6900e15116b9ecf69f488c1f1e46cc95261829afcd7031ad4d6cc169760c315a7a2b1097d63706dc5b5bd0e46
7
- data.tar.gz: 29bfcedcadee57b04a791c064ebe1fa56327f0cdd54ec96578b2eacd899540dc737472dadea02a4aa34aa8582aef5a26bec7722a8a169864eb4e84eda4a7ddda
6
+ metadata.gz: 15348dcc0e22146f014239eae49e90a0e4fd95050d44c42cab4ee461e165ea63f407b797c70001c49180d36c0fef47ca166aa01e26253d08ca2412b3cbeac7b0
7
+ data.tar.gz: b3f5b11e82ed73e2d0c7373f61af61fd1b861c45e2399b02e010399d24139d89ded5ecaae5663d17b19fec370e9ccec592e3dff2734f2431c9f493291ad965a5
data/CHANGES.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ## v10.0.2
4
+ * bootdisk_raise template marco works in preview mode (#22136)
5
+ * host image works with subnet without gateway (#21106)
6
+
3
7
  ## v10.0.1
4
8
  * Fix rake tasks are Taxonomy and User aware (#21877)
5
9
  * Revert alias_method_chain with Module#prepend for Katello 3.4 compatibility
data/app/models/concerns/foreman_bootdisk/host_ext.rb CHANGED
@@ -21,10 +21,6 @@ module ForemanBootdisk::HostExt
21
21
  ForemanBootdisk::Renderer.format_bootdisk_chain_url(foreman_url(action), mac)
22
22
  end
23
23
 
24
- def bootdisk_raise(*args)
25
- raise ::Foreman::Exception.new(*args)
26
- end
27
-
28
24
  def bootdisk_build?
29
25
  provision_method == 'bootdisk'
30
26
  end
data/app/services/foreman_bootdisk/renderer_methods.rb CHANGED
@@ -15,5 +15,9 @@ module ForemanBootdisk
15
15
  def bootdisk_chain_url(mac = '', action = 'iPXE')
16
16
  self.class.format_bootdisk_chain_url(foreman_url(action), mac)
17
17
  end
18
+
19
+ def bootdisk_raise(*args)
20
+ raise ::Foreman::Exception.new(*args)
21
+ end
18
22
  end
19
23
  end
data/app/views/foreman_bootdisk/host.erb CHANGED
@@ -10,8 +10,6 @@ bootdisk_raise(N_('Host has no provisioning interface defined')) unless interfac
10
10
  bootdisk_raise(N_('Host has no IP address defined')) if interface.ip.nil? || interface.ip.empty?
11
11
  bootdisk_raise(N_('Host has no subnet defined')) unless interface.subnet
12
12
  bootdisk_raise(N_('Host has no domain defined')) unless interface.domain
13
- bootdisk_raise(N_('Subnet (%s) has no gateway defined'), interface.subnet) if interface.subnet.gateway.nil? || interface.subnet.gateway.empty?
14
- bootdisk_raise(N_('Subnet (%s) has no primary DNS server defined'), interface.subnet) if interface.subnet.dns_primary.nil? || interface.subnet.dns_primary.empty?
15
13
  %>
16
14
 
17
15
  echo Foreman Bootdisk: Host image (<%= @host.name %>)
@@ -31,14 +29,18 @@ echo Configuring net${idx} for static IP address <%= interface.ip %>
31
29
  ifopen net${idx}
32
30
  set netX/ip <%= interface.ip %>
33
31
  set netX/netmask <%= interface.subnet.mask %>
32
+ <% if interface.subnet.gateway.present? %>
34
33
  set netX/gateway <%= interface.subnet.gateway %>
34
+ <% end %>
35
35
  ifstat net${idx}
36
36
  route
37
37
 
38
+ <% if interface.subnet.dns_primary.present? %>
38
39
  # Note, iPXE can only use one DNS server
39
40
  echo Using DNS <%= interface.subnet.dns_primary %>
40
41
  set dns <%= interface.subnet.dns_primary %>
41
42
  set domain <%= interface.domain.to_s %>
43
+ <% end %>
42
44
 
43
45
  # Chainload from Foreman rather than embedding OS info here, so the behaviour
44
46
  # is entirely dynamic.
data/lib/foreman_bootdisk/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanBootdisk
2
- VERSION = '10.0.1'
2
+ VERSION = '10.0.2'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_bootdisk
3
3
  version: !ruby/object:Gem::Version
4
- version: 10.0.1
4
+ version: 10.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dominic Cleal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-06 00:00:00.000000000 Z
11
+ date: 2018-01-08 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
14
14
  without the need for PXE infrastructure.
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
116
116
  version: '0'
117
117
  requirements: []
118
118
  rubyforge_project:
119
- rubygems_version: 2.6.12
119
+ rubygems_version: 2.7.3
120
120
  signing_key:
121
121
  specification_version: 4
122
122
  summary: Create boot disks to provision hosts with Foreman