foreman_bootdisk 15.0.0 → 15.1.0

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 (35) hide show
  1. checksums.yaml +4 -4
  2. data/AUTHORS +1 -0
  3. data/app/services/foreman_bootdisk/iso_generator.rb +6 -3
  4. data/app/views/foreman_bootdisk/host.erb +22 -8
  5. data/lib/foreman_bootdisk/version.rb +1 -1
  6. data/locale/ca/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  7. data/locale/ca/foreman_bootdisk.po +1 -1
  8. data/locale/de/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  9. data/locale/de/foreman_bootdisk.po +1 -1
  10. data/locale/en/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  11. data/locale/en/foreman_bootdisk.po +11 -2
  12. data/locale/en_GB/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  13. data/locale/en_GB/foreman_bootdisk.po +1 -1
  14. data/locale/es/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  15. data/locale/es/foreman_bootdisk.po +1 -1
  16. data/locale/foreman_bootdisk.pot +18 -6
  17. data/locale/fr/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  18. data/locale/fr/foreman_bootdisk.po +1 -1
  19. data/locale/it/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  20. data/locale/it/foreman_bootdisk.po +1 -1
  21. data/locale/ja/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  22. data/locale/ja/foreman_bootdisk.po +1 -1
  23. data/locale/ko/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  24. data/locale/ko/foreman_bootdisk.po +1 -1
  25. data/locale/pt_BR/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  26. data/locale/pt_BR/foreman_bootdisk.po +1 -1
  27. data/locale/ru/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  28. data/locale/ru/foreman_bootdisk.po +1 -1
  29. data/locale/sv_SE/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  30. data/locale/sv_SE/foreman_bootdisk.po +1 -1
  31. data/locale/zh_CN/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  32. data/locale/zh_CN/foreman_bootdisk.po +1 -1
  33. data/locale/zh_TW/LC_MESSAGES/foreman_bootdisk.mo +0 -0
  34. data/locale/zh_TW/foreman_bootdisk.po +1 -1
  35. metadata +3 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4733307c911d25a22301bdb3527422e04e4ab2491c2210b914f3c27d00ca1ea2
4
- data.tar.gz: 14955cfafbe62b393e45927a36805173a00e41f8bf0e4868f7f11026bc260fac
3
+ metadata.gz: 503b42016922a0ebae27cf03e23dfa8f5b28ce63233cafccacde615c03def07d
4
+ data.tar.gz: 8c41666a3da10f0dbe4e48faa648953b5af89fad3f349a4c31b1320a4ed1e13b
5
5
  SHA512:
6
- metadata.gz: b605a6809d4cfa2c2fee39e1744c54f4114b1b05d64e46e983cf2f4d3344766b4173d6a4519e1758e2afc30d0f0aa12b64e013208d2f706828ae8aa8fb8381d7
7
- data.tar.gz: 2497d42c876c57097cde13de621696b3fb60140238ef00585e49e76980a6d28d12bd0c4931120648f2af20ef55d9f9865522eb59a2a74a71673d3634a169e66d
6
+ metadata.gz: a76d03e9e3495adf3dbd4e9bb47d52aed9adc5b14211c5ff5bc386a7c091e8ecdc30c16e911205ceaee0b62e1e48934e09ef111bf113bbf80db57963432cc14d
7
+ data.tar.gz: 1d333f7d357938013998632b3460a0d50b25ff0dc082bcc87b3e46f7f424f35a5bed7da446ee3cf311b8bd0c9573b4df48462427c5e1057d2db62d56989e431b
data/AUTHORS CHANGED
@@ -1,4 +1,5 @@
1
1
  Bryan Kearney
2
+ crito
2
3
  Dominic Cleal
3
4
  Greg Sutcliffe
4
5
  Ido Kanner
@@ -63,8 +63,11 @@ module ForemanBootdisk
63
63
 
64
64
  FileUtils.cp(isolinux_source_file, File.join(wd, 'build', 'isolinux.bin'))
65
65
 
66
- ldlinux_source_file = File.join(Setting[:bootdisk_syslinux_dir], 'ldlinux.c32')
67
- FileUtils.cp(ldlinux_source_file, File.join(wd, 'build', 'ldlinux.c32')) if File.exist?(ldlinux_source_file)
66
+ source_files = ['ldlinux.c32', 'menu.c32']
67
+ source_files.each do |source_file|
68
+ full_path = File.join(Setting[:bootdisk_syslinux_dir], source_file)
69
+ FileUtils.cp(full_path, File.join(wd, 'build', source_file)) if File.exist?(source_file)
70
+ end
68
71
 
69
72
  File.open(File.join(wd, 'build', 'isolinux.cfg'), 'w') do |file|
70
73
  file.write(opts[:isolinux])
@@ -153,7 +156,7 @@ module ForemanBootdisk
153
156
  # prevent multiple writes to the cache
154
157
  write_cache = false
155
158
  else
156
- response.error!
159
+ raise(::Foreman::Exception.new N_("Unable to download boot file %{uri}, HTTP return code %{code}" % { uri: uri, code: response.code }))
157
160
  end
158
161
  end
159
162
  end
@@ -7,9 +7,23 @@
7
7
  <%
8
8
  interface = @host.provision_interface
9
9
  bootdisk_raise(N_('Host has no provisioning interface defined')) unless interface
10
- bootdisk_raise(N_('Host has no IP address defined')) if interface.ip.nil? || interface.ip.empty?
11
- bootdisk_raise(N_('Host has no subnet defined')) unless interface.subnet
10
+ bootdisk_raise(N_('Host has no IPv4 or IPv6 address defined')) unless interface.ip.present? || interface.ip6.present?
11
+ bootdisk_raise(N_('Host has no subnet defined')) unless interface.subnet || interface.subnet6
12
12
  bootdisk_raise(N_('Host has no domain defined')) unless interface.domain
13
+ if interface.ip.present? && interface.subnet
14
+ ip = interface.ip
15
+ subnet = interface.subnet
16
+ elsif interface.ip6.present? && interface.subnet6
17
+ ip = interface.ip6
18
+ subnet = interface.subnet6
19
+ bootdisk_raise(N_('Host bootdisk does not work with static IPv6'))
20
+ else
21
+ bootdisk_raise(N_('Both IP and Subnet must be set'))
22
+ end
23
+
24
+ mask = subnet.mask
25
+ gw = subnet.gateway
26
+ dns = subnet.dns_servers.first
13
27
  %>
14
28
 
15
29
  echo Foreman Bootdisk: Host image (<%= @host.name %>)
@@ -25,19 +39,19 @@ goto loop_success
25
39
  <% end -%>
26
40
 
27
41
  :loop_success
28
- echo Configuring net${idx} for static IP address <%= interface.ip %>
42
+ echo Configuring net${idx} for static IP address <%= ip %>
29
43
  ifopen net${idx}
30
- set netX/ip <%= interface.ip %>
31
- set netX/netmask <%= interface.subnet.mask %>
32
- <% if interface.subnet.gateway.present? %>
33
- set netX/gateway <%= interface.subnet.gateway %>
44
+ # netX = last opened NIC
45
+ set netX/ip <%= ip %>
46
+ set netX/netmask <%= mask %>
47
+ <% if gw.present? %>
48
+ set netX/gateway <%= gw %>
34
49
  <% end %>
35
50
  ifstat net${idx}
36
51
  route
37
52
 
38
53
  # Note: When multiple DNS servers are specified, only the first
39
54
  # server will be used. See: http://ipxe.org/cfg/dns
40
- <% dns = interface.subnet.dns_servers.first -%>
41
55
  <% if dns.present? -%>
42
56
  echo Using DNS <%= dns %>
43
57
  set dns <%= dns %>
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ForemanBootdisk
4
- VERSION = '15.0.0'
4
+ VERSION = '15.1.0'
5
5
  end
@@ -7,7 +7,7 @@
7
7
  # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
8
8
  msgid ""
9
9
  msgstr ""
10
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
10
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
11
11
  "Report-Msgid-Bugs-To: \n"
12
12
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
13
13
  "Last-Translator: Lukáš Zapletal\n"
@@ -12,7 +12,7 @@
12
12
  # simon11 <simon.stieger.98@live.de>, 2014
13
13
  msgid ""
14
14
  msgstr ""
15
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
15
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
16
16
  "Report-Msgid-Bugs-To: \n"
17
17
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
18
18
  "Last-Translator: Lukáš Zapletal\n"
@@ -4,7 +4,7 @@
4
4
  #
5
5
  msgid ""
6
6
  msgstr ""
7
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
7
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
8
8
  "Report-Msgid-Bugs-To: \n"
9
9
  "PO-Revision-Date: 2014-02-13 12:09+0000\n"
10
10
  "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
@@ -42,6 +42,9 @@ msgstr ""
42
42
  msgid "Boot disks"
43
43
  msgstr ""
44
44
 
45
+ msgid "Both IP and Subnet must be set"
46
+ msgstr ""
47
+
45
48
  msgid "Command to generate ISO image, use genisoimage or mkisofs"
46
49
  msgstr ""
47
50
 
@@ -90,7 +93,10 @@ msgstr ""
90
93
  msgid "Host '%s' image"
91
94
  msgstr ""
92
95
 
93
- msgid "Host has no IP address defined"
96
+ msgid "Host bootdisk does not work with static IPv6"
97
+ msgstr ""
98
+
99
+ msgid "Host has no IPv4 or IPv6 address defined"
94
100
  msgstr ""
95
101
 
96
102
  msgid "Host has no domain defined"
@@ -183,6 +189,9 @@ msgstr ""
183
189
  msgid "True for full, false for basic reusable image"
184
190
  msgstr ""
185
191
 
192
+ msgid "Unable to download boot file %{uri}, HTTP return code %{code}"
193
+ msgstr ""
194
+
186
195
  msgid "Unable to find template specified by %s setting"
187
196
  msgstr ""
188
197
 
@@ -8,7 +8,7 @@
8
8
  # Dominic Cleal <dominic@cleal.org>, 2016
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
11
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
13
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
14
14
  "Last-Translator: Lukáš Zapletal\n"
@@ -7,7 +7,7 @@
7
7
  # Sergio Ocón <sergio.ocon@redhat.com>, 2014
8
8
  msgid ""
9
9
  msgstr ""
10
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
10
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
11
11
  "Report-Msgid-Bugs-To: \n"
12
12
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
13
13
  "Last-Translator: Lukáš Zapletal\n"
@@ -8,8 +8,8 @@ msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: foreman_bootdisk 1.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2019-05-13 16:37+0200\n"
12
- "PO-Revision-Date: 2019-05-13 16:37+0200\n"
11
+ "POT-Creation-Date: 2019-08-12 08:38+0200\n"
12
+ "PO-Revision-Date: 2019-08-12 08:38+0200\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -188,18 +188,22 @@ msgstr ""
188
188
  msgid "Please ensure the isolinux/syslinux package(s) are installed."
189
189
  msgstr ""
190
190
 
191
- #: ../app/services/foreman_bootdisk/iso_generator.rb:76
191
+ #: ../app/services/foreman_bootdisk/iso_generator.rb:79
192
192
  msgid "Please ensure the ipxe-bootimgs package is installed."
193
193
  msgstr ""
194
194
 
195
- #: ../app/services/foreman_bootdisk/iso_generator.rb:95
195
+ #: ../app/services/foreman_bootdisk/iso_generator.rb:98
196
196
  msgid "ISO build failed"
197
197
  msgstr ""
198
198
 
199
- #: ../app/services/foreman_bootdisk/iso_generator.rb:98
199
+ #: ../app/services/foreman_bootdisk/iso_generator.rb:101
200
200
  msgid "ISO hybrid conversion failed"
201
201
  msgstr ""
202
202
 
203
+ #: ../app/services/foreman_bootdisk/iso_generator.rb:159
204
+ msgid "Unable to download boot file %{uri}, HTTP return code %{code}"
205
+ msgstr ""
206
+
203
207
  #: ../app/views/foreman_bootdisk/disks/help.html.erb:2
204
208
  msgid "Back"
205
209
  msgstr ""
@@ -282,7 +286,7 @@ msgid "Host has no provisioning interface defined"
282
286
  msgstr ""
283
287
 
284
288
  #: ../app/views/foreman_bootdisk/host.erb:10
285
- msgid "Host has no IP address defined"
289
+ msgid "Host has no IPv4 or IPv6 address defined"
286
290
  msgstr ""
287
291
 
288
292
  #: ../app/views/foreman_bootdisk/host.erb:11
@@ -293,6 +297,14 @@ msgstr ""
293
297
  msgid "Host has no domain defined"
294
298
  msgstr ""
295
299
 
300
+ #: ../app/views/foreman_bootdisk/host.erb:19
301
+ msgid "Host bootdisk does not work with static IPv6"
302
+ msgstr ""
303
+
304
+ #: ../app/views/foreman_bootdisk/host.erb:21
305
+ msgid "Both IP and Subnet must be set"
306
+ msgstr ""
307
+
296
308
  #: ../lib/foreman_bootdisk/engine.rb:54
297
309
  msgid "Boot disk based"
298
310
  msgstr ""
@@ -8,7 +8,7 @@
8
8
  # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014,2016-2017
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
11
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
13
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
14
14
  "Last-Translator: Lukáš Zapletal\n"
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
8
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
11
11
  "Last-Translator: Lukáš Zapletal\n"
@@ -6,7 +6,7 @@
6
6
  # Shuji Yamada <uzy.exe@gmail.com>, 2015
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
9
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
11
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
12
12
  "Last-Translator: Lukáš Zapletal\n"
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
8
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
11
11
  "Last-Translator: Lukáš Zapletal\n"
@@ -8,7 +8,7 @@
8
8
  # Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 2015
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
11
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
13
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
14
14
  "Last-Translator: Lukáš Zapletal\n"
@@ -7,7 +7,7 @@
7
7
  # Yulia <yulia.poyarkova@redhat.com>, 2016
8
8
  msgid ""
9
9
  msgstr ""
10
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
10
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
11
11
  "Report-Msgid-Bugs-To: \n"
12
12
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
13
13
  "Last-Translator: Lukáš Zapletal\n"
@@ -6,7 +6,7 @@
6
6
  # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
9
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
11
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
12
12
  "Last-Translator: Lukáš Zapletal\n"
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
8
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
11
11
  "Last-Translator: Lukáš Zapletal\n"
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_bootdisk 14.0.0\n"
8
+ "Project-Id-Version: foreman_bootdisk 15.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2019-04-18 20:22+0000\n"
11
11
  "Last-Translator: Lukáš Zapletal\n"
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: 15.0.0
4
+ version: 15.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dominic Cleal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-05-13 00:00:00.000000000 Z
11
+ date: 2019-08-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rubocop
@@ -149,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
149
149
  - !ruby/object:Gem::Version
150
150
  version: '0'
151
151
  requirements: []
152
- rubyforge_project:
153
- rubygems_version: 2.7.6
152
+ rubygems_version: 3.0.3
154
153
  signing_key:
155
154
  specification_version: 4
156
155
  summary: Create boot disks to provision hosts with Foreman