foreman_bootdisk 15.0.0 → 15.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4733307c911d25a22301bdb3527422e04e4ab2491c2210b914f3c27d00ca1ea2
-  data.tar.gz: 14955cfafbe62b393e45927a36805173a00e41f8bf0e4868f7f11026bc260fac
+  metadata.gz: 503b42016922a0ebae27cf03e23dfa8f5b28ce63233cafccacde615c03def07d
+  data.tar.gz: 8c41666a3da10f0dbe4e48faa648953b5af89fad3f349a4c31b1320a4ed1e13b
 SHA512:
-  metadata.gz: b605a6809d4cfa2c2fee39e1744c54f4114b1b05d64e46e983cf2f4d3344766b4173d6a4519e1758e2afc30d0f0aa12b64e013208d2f706828ae8aa8fb8381d7
-  data.tar.gz: 2497d42c876c57097cde13de621696b3fb60140238ef00585e49e76980a6d28d12bd0c4931120648f2af20ef55d9f9865522eb59a2a74a71673d3634a169e66d
+  metadata.gz: a76d03e9e3495adf3dbd4e9bb47d52aed9adc5b14211c5ff5bc386a7c091e8ecdc30c16e911205ceaee0b62e1e48934e09ef111bf113bbf80db57963432cc14d
+  data.tar.gz: 1d333f7d357938013998632b3460a0d50b25ff0dc082bcc87b3e46f7f424f35a5bed7da446ee3cf311b8bd0c9573b4df48462427c5e1057d2db62d56989e431b

data/AUTHORS

@@ -1,4 +1,5 @@
 Bryan Kearney
+crito
 Dominic Cleal
 Greg Sutcliffe
 Ido Kanner

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -63,8 +63,11 @@ module ForemanBootdisk
 
           FileUtils.cp(isolinux_source_file, File.join(wd, 'build', 'isolinux.bin'))
 
-          ldlinux_source_file = File.join(Setting[:bootdisk_syslinux_dir], 'ldlinux.c32')
-          FileUtils.cp(ldlinux_source_file, File.join(wd, 'build', 'ldlinux.c32')) if File.exist?(ldlinux_source_file)
+          source_files = ['ldlinux.c32', 'menu.c32']
+          source_files.each do |source_file|
+            full_path = File.join(Setting[:bootdisk_syslinux_dir], source_file)
+            FileUtils.cp(full_path, File.join(wd, 'build', source_file)) if File.exist?(source_file)
+          end
 
           File.open(File.join(wd, 'build', 'isolinux.cfg'), 'w') do |file|
             file.write(opts[:isolinux])
@@ -153,7 +156,7 @@ module ForemanBootdisk
                 # prevent multiple writes to the cache
                 write_cache = false
               else
-                response.error!
+                raise(::Foreman::Exception.new N_("Unable to download boot file %{uri}, HTTP return code %{code}" % { uri: uri, code: response.code }))
               end
             end
           end

data/app/views/foreman_bootdisk/host.erb

@@ -7,9 +7,23 @@
 <%
 interface = @host.provision_interface
 bootdisk_raise(N_('Host has no provisioning interface defined')) unless interface
-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 IPv4 or IPv6 address defined')) unless interface.ip.present? || interface.ip6.present?
+bootdisk_raise(N_('Host has no subnet defined')) unless interface.subnet || interface.subnet6
 bootdisk_raise(N_('Host has no domain defined')) unless interface.domain
+if interface.ip.present? && interface.subnet
+  ip = interface.ip
+  subnet = interface.subnet
+elsif interface.ip6.present? && interface.subnet6
+  ip = interface.ip6
+  subnet = interface.subnet6
+  bootdisk_raise(N_('Host bootdisk does not work with static IPv6'))
+else
+  bootdisk_raise(N_('Both IP and Subnet must be set'))
+end
+
+mask = subnet.mask
+gw = subnet.gateway
+dns = subnet.dns_servers.first
 %>
 
 echo Foreman Bootdisk: Host image (<%= @host.name %>)
@@ -25,19 +39,19 @@ goto loop_success
 <% end -%>
 
 :loop_success
-echo Configuring net${idx} for static IP address <%= interface.ip %>
+echo Configuring net${idx} for static IP address <%= 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 %>
+# netX = last opened NIC
+set netX/ip <%= ip %>
+set netX/netmask <%= mask %>
+<% if gw.present? %>
+set netX/gateway <%= gw %>
 <% end %>
 ifstat net${idx}
 route
 
 # Note: When multiple DNS servers are specified, only the first
 # server will be used. See: http://ipxe.org/cfg/dns
-<% dns = interface.subnet.dns_servers.first -%>
 <% if dns.present? -%>
 echo Using DNS <%= dns %>
 set dns <%= dns %>

data/lib/foreman_bootdisk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanBootdisk
-  VERSION = '15.0.0'
+  VERSION = '15.1.0'
 end

data/locale/ca/foreman_bootdisk.po

@@ -7,7 +7,7 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/de/foreman_bootdisk.po

@@ -12,7 +12,7 @@
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/en/foreman_bootdisk.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-02-13 12:09+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
@@ -42,6 +42,9 @@ msgstr ""
 msgid "Boot disks"
 msgstr ""
 
+msgid "Both IP and Subnet must be set"
+msgstr ""
+
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr ""
 
@@ -90,7 +93,10 @@ msgstr ""
 msgid "Host '%s' image"
 msgstr ""
 
-msgid "Host has no IP address defined"
+msgid "Host bootdisk does not work with static IPv6"
+msgstr ""
+
+msgid "Host has no IPv4 or IPv6 address defined"
 msgstr ""
 
 msgid "Host has no domain defined"
@@ -183,6 +189,9 @@ msgstr ""
 msgid "True for full, false for basic reusable image"
 msgstr ""
 
+msgid "Unable to download boot file %{uri}, HTTP return code %{code}"
+msgstr ""
+
 msgid "Unable to find template specified by %s setting"
 msgstr ""
 

data/locale/en_GB/foreman_bootdisk.po

@@ -8,7 +8,7 @@
 # Dominic Cleal <dominic@cleal.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/es/foreman_bootdisk.po

@@ -7,7 +7,7 @@
 # Sergio Ocón <sergio.ocon@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/foreman_bootdisk.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_bootdisk 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-13 16:37+0200\n"
-"PO-Revision-Date: 2019-05-13 16:37+0200\n"
+"POT-Creation-Date: 2019-08-12 08:38+0200\n"
+"PO-Revision-Date: 2019-08-12 08:38+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -188,18 +188,22 @@ msgstr ""
 msgid "Please ensure the isolinux/syslinux package(s) are installed."
 msgstr ""
 
-#: ../app/services/foreman_bootdisk/iso_generator.rb:76
+#: ../app/services/foreman_bootdisk/iso_generator.rb:79
 msgid "Please ensure the ipxe-bootimgs package is installed."
 msgstr ""
 
-#: ../app/services/foreman_bootdisk/iso_generator.rb:95
+#: ../app/services/foreman_bootdisk/iso_generator.rb:98
 msgid "ISO build failed"
 msgstr ""
 
-#: ../app/services/foreman_bootdisk/iso_generator.rb:98
+#: ../app/services/foreman_bootdisk/iso_generator.rb:101
 msgid "ISO hybrid conversion failed"
 msgstr ""
 
+#: ../app/services/foreman_bootdisk/iso_generator.rb:159
+msgid "Unable to download boot file %{uri}, HTTP return code %{code}"
+msgstr ""
+
 #: ../app/views/foreman_bootdisk/disks/help.html.erb:2
 msgid "Back"
 msgstr ""
@@ -282,7 +286,7 @@ msgid "Host has no provisioning interface defined"
 msgstr ""
 
 #: ../app/views/foreman_bootdisk/host.erb:10
-msgid "Host has no IP address defined"
+msgid "Host has no IPv4 or IPv6 address defined"
 msgstr ""
 
 #: ../app/views/foreman_bootdisk/host.erb:11
@@ -293,6 +297,14 @@ msgstr ""
 msgid "Host has no domain defined"
 msgstr ""
 
+#: ../app/views/foreman_bootdisk/host.erb:19
+msgid "Host bootdisk does not work with static IPv6"
+msgstr ""
+
+#: ../app/views/foreman_bootdisk/host.erb:21
+msgid "Both IP and Subnet must be set"
+msgstr ""
+
 #: ../lib/foreman_bootdisk/engine.rb:54
 msgid "Boot disk based"
 msgstr ""

data/locale/fr/foreman_bootdisk.po

@@ -8,7 +8,7 @@
 # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014,2016-2017
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/it/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/ja/foreman_bootdisk.po

@@ -6,7 +6,7 @@
 # Shuji Yamada <uzy.exe@gmail.com>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/ko/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/pt_BR/foreman_bootdisk.po

@@ -8,7 +8,7 @@
 # Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/ru/foreman_bootdisk.po

@@ -7,7 +7,7 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/sv_SE/foreman_bootdisk.po

@@ -6,7 +6,7 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/zh_CN/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

data/locale/zh_TW/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 15.1.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-13 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -149,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman