foreman_bootdisk 15.1.0 → 16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 503b42016922a0ebae27cf03e23dfa8f5b28ce63233cafccacde615c03def07d
-  data.tar.gz: 8c41666a3da10f0dbe4e48faa648953b5af89fad3f349a4c31b1320a4ed1e13b
+  metadata.gz: 3a69fd6de3a18c8670dfe431cf989b8c02f94b9aa48da2c17aa93e504d98f869
+  data.tar.gz: 7354aff9025bfdd9f1acd3e312b2350268866b108a534dc3143b99ff731de1b9
 SHA512:
-  metadata.gz: a76d03e9e3495adf3dbd4e9bb47d52aed9adc5b14211c5ff5bc386a7c091e8ecdc30c16e911205ceaee0b62e1e48934e09ef111bf113bbf80db57963432cc14d
-  data.tar.gz: 1d333f7d357938013998632b3460a0d50b25ff0dc082bcc87b3e46f7f424f35a5bed7da446ee3cf311b8bd0c9573b4df48462427c5e1057d2db62d56989e431b
+  metadata.gz: 1fe67673899bbaf6b8588103341bf6f8436aecc7d761e574f9c835940d530eb199bbc29c44a61234710abd7ec00a76e2e89dc7ecbcb17211a0c7ff5df27d8c16
+  data.tar.gz: 70838f0a73b4c1541bc728de2f0399aa3946da0714e31b05d1dee08a7254aa6be8c1cd0a3b769dcfa566b21963fd9fb0591792e23758c6ceeb4885a1a2a3ff20

data/AUTHORS

@@ -1,5 +1,4 @@
 Bryan Kearney
-crito
 Dominic Cleal
 Greg Sutcliffe
 Ido Kanner
@@ -14,11 +13,14 @@ Michael Hofer
 Michael Moll
 Ohad Levy
 Ondrej Prazak
+Ondřej Ezr
 Ondřej Pražák
 Robert Antoni Buj Gelonch
+Rohan21Lobo
 Ronald van Zantvoort
 Sam Kottler
 Sean O'Keeffe
 Stephen Benjamin
 Swapnil Abnave
 Timo Goebel
+crito

data/README.md

@@ -236,6 +236,22 @@ To generate from the command line on the Foreman server:
 Set `OUTPUT=/path` to change the output destination path (directory or file).
 It must be writable by the 'foreman' user.
 
+### Generic static image
+
+This is generic image type which asks for network credentials instead of doing
+DHCP request. Tokens must be turned off in order to find the host by MAC
+address. To do that, set Token duration to 0 in Administer - Settings.
+
+- Network interface name
+- IP Address
+- Netmask
+- Gateway
+- DNS
+
+To use generic static host image, set "Generic image template" to "Bootdisk
+iPXE - host template" in Administer - Settings - Boot disk. Only one template
+can be used at one time across all hosts.
+
 ### Subnet images
 
 Subnet images are similar to generic images, but chain-loading is done via the

data/app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -2,27 +2,27 @@
 
 module ForemanBootdisk
   module HostsHelperExt
-    def host_title_actions(*args)
-      if @host.bootdisk_downloadable?
+    def host_title_actions(host)
+      if host.bootdisk_downloadable?
         title_actions(
           button_group(
             select_action_button(
               _('Boot disk'), { class: 'btn btn-group' },
               display_bootdisk_link_if_authorized(
-                _("Host '%s' image") % @host.name.split('.')[0],
+                _("Host '%s' image") % host.name.split('.')[0],
                 {
                   controller: 'foreman_bootdisk/disks',
                   action: 'host',
-                  id: @host
+                  id: host
                 },
                 class: 'la'
               ),
               display_bootdisk_link_if_authorized(
-                _("Full host '%s' image") % @host.name.split('.')[0],
+                _("Full host '%s' image") % host.name.split('.')[0],
                 {
                   controller: 'foreman_bootdisk/disks',
                   action: 'full_host',
-                  id: @host
+                  id: host
                 },
                 class: 'la'
               ),
@@ -35,7 +35,7 @@ module ForemanBootdisk
                 },
                 class: 'la'
               ),
-              display_bootdisk_for_subnet,
+              display_bootdisk_for_subnet(host),
               content_tag(:li, '', class: 'divider'),
               display_bootdisk_link_if_authorized(
                 _('Help'), {
@@ -48,29 +48,29 @@ module ForemanBootdisk
           )
         )
       else
-        bootdisk_button_disabled
+        bootdisk_button_disabled(host)
       end
 
       super
     end
 
-    def bootdisk_button_disabled
+    def bootdisk_button_disabled(host)
       title_actions(
         button_group(
           link_to(_('Boot disk'), '#', disabled: true, class: 'btn btn-default',
-                                       title: _('Boot disk download not available for %s architecture') % @host.architecture.name)
+                                       title: _('Boot disk download not available for %s architecture') % host.architecture.name)
         )
       )
     end
 
     # need to wrap this one in a test for template proxy presence
-    def display_bootdisk_for_subnet
-      if (proxy = @host.try(:subnet).try(:tftp)) && proxy.has_feature?('Templates')
+    def display_bootdisk_for_subnet(host)
+      if (proxy = host.try(:subnet).try(:tftp)) && proxy.has_feature?('Templates')
         display_bootdisk_link_if_authorized(
-          _("Subnet '%s' generic image") % @host.subnet.name, {
+          _("Subnet '%s' generic image") % host.subnet.name, {
             controller: 'foreman_bootdisk/disks',
             action: 'subnet',
-            id: @host
+            id: host
           },
           class: 'la'
         )

data/app/models/setting/bootdisk.rb

@@ -2,30 +2,23 @@
 
 class Setting
   class Bootdisk < ::Setting
-    def self.load_defaults
-      return unless ApplicationRecord.connection.table_exists?('settings')
-      return unless super
-
+    def self.default_settings
       ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
       isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
       syslinux = ['/usr/lib/syslinux/modules/bios', '/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
       templates = -> { Hash[ProvisioningTemplate.where(template_kind: TemplateKind.where(name: 'Bootdisk')).map { |temp| [temp[:name], temp[:name]] }] }
 
-      Setting.transaction do
-        [
-          set('bootdisk_ipxe_dir', N_('Path to directory containing iPXE images'), ipxe, N_('iPXE directory')),
-          set('bootdisk_isolinux_dir', N_('Path to directory containing isolinux images'), isolinux, N_('ISOLINUX directory')),
-          set('bootdisk_syslinux_dir', N_('Path to directory containing syslinux images'), syslinux, N_('SYSLINUX directory')),
-          set('bootdisk_host_template', N_('iPXE template to use for host-specific boot disks'),
-              'Boot disk iPXE - host', N_('Host image template'), nil, collection: templates),
-          set('bootdisk_generic_host_template', N_('iPXE template to use for generic host boot disks'),
-              'Boot disk iPXE - generic host', N_('Generic image template'), nil, collection: templates),
-          set('bootdisk_mkiso_command', N_('Command to generate ISO image, use genisoimage or mkisofs'), 'genisoimage', N_('ISO generation command')),
-          set('bootdisk_cache_media', N_('Installation media files will be cached for full host images'), true, N_('Installation media caching'))
-        ].compact.each { |s| create s.update(category: 'Setting::Bootdisk') }
-      end
-
-      true
+      [
+        set('bootdisk_ipxe_dir', N_('Path to directory containing iPXE images'), ipxe, N_('iPXE directory')),
+        set('bootdisk_isolinux_dir', N_('Path to directory containing isolinux images'), isolinux, N_('ISOLINUX directory')),
+        set('bootdisk_syslinux_dir', N_('Path to directory containing syslinux images'), syslinux, N_('SYSLINUX directory')),
+        set('bootdisk_host_template', N_('iPXE template to use for host-specific boot disks'),
+            'Boot disk iPXE - host', N_('Host image template'), nil, collection: templates),
+        set('bootdisk_generic_host_template', N_('iPXE template to use for generic host boot disks'),
+            'Boot disk iPXE - generic host', N_('Generic image template'), nil, collection: templates),
+        set('bootdisk_mkiso_command', N_('Command to generate ISO image, use genisoimage or mkisofs'), 'genisoimage', N_('ISO generation command')),
+        set('bootdisk_cache_media', N_('Installation media files will be cached for full host images'), true, N_('Installation media caching'))
+      ]
     end
 
     def self.humanized_category

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -11,7 +11,7 @@ require 'uri'
 module ForemanBootdisk
   class ISOGenerator
     def self.generate_full_host(host, opts = {}, &block)
-      raise Foreman::Exception, N_('Host is not in build mode, so the template cannot be rendered') unless host.build?
+      raise(Foreman::Exception, N_('Host is not in build mode, so the template cannot be rendered')) unless host.build?
 
       tmpl = render_pxelinux_template(host)
 
@@ -30,7 +30,7 @@ module ForemanBootdisk
     def self.render_pxelinux_template(host)
       pxelinux_template = host.provisioning_template(kind: :PXELinux)
 
-      raise Foreman::Exception, N_('Unable to generate disk template, PXELinux template not found.') unless pxelinux_template
+      raise(Foreman::Exception, N_('Unable to generate disk template, PXELinux template not found.')) unless pxelinux_template
 
       template = ForemanBootdisk::Renderer.new.render_template(
         template: pxelinux_template,
@@ -40,7 +40,7 @@ module ForemanBootdisk
 
       unless template
         err = host.errors.full_messages.to_sentence
-        raise ::Foreman::Exception.new(N_('Unable to generate disk PXELinux template: %s'), err)
+        raise(::Foreman::Exception.new(N_('Unable to generate disk PXELinux template: %s'), err))
       end
 
       template
@@ -59,7 +59,7 @@ module ForemanBootdisk
 
         if opts[:isolinux]
           isolinux_source_file = File.join(Setting[:bootdisk_isolinux_dir], 'isolinux.bin')
-          raise Foreman::Exception, N_('Please ensure the isolinux/syslinux package(s) are installed.') unless File.exist?(isolinux_source_file)
+          raise(Foreman::Exception, N_('Please ensure the isolinux/syslinux package(s) are installed.')) unless File.exist?(isolinux_source_file)
 
           FileUtils.cp(isolinux_source_file, File.join(wd, 'build', 'isolinux.bin'))
 
@@ -76,7 +76,7 @@ module ForemanBootdisk
 
         if opts[:ipxe]
           ipxe_source_file = File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn')
-          raise Foreman::Exception, N_('Please ensure the ipxe-bootimgs package is installed.') unless File.exist?(ipxe_source_file)
+          raise(Foreman::Exception, N_('Please ensure the ipxe-bootimgs package is installed.')) unless File.exist?(ipxe_source_file)
 
           FileUtils.cp(ipxe_source_file, File.join(wd, 'build', 'ipxe'))
           File.open(File.join(wd, 'build', 'script'), 'w') { |file| file.write(opts[:ipxe]) }
@@ -95,10 +95,10 @@ module ForemanBootdisk
               else
                 File.join(wd, 'output.iso')
               end
-        raise Foreman::Exception, N_('ISO build failed') unless system(build_mkiso_command(output_file: iso, source_directory: File.join(wd, 'build')))
+        raise(Foreman::Exception, N_('ISO build failed')) unless system(build_mkiso_command(output_file: iso, source_directory: File.join(wd, 'build')))
 
         # Make the ISO bootable as a HDD/USB disk too
-        raise Foreman::Exception, N_('ISO hybrid conversion failed') unless system('isohybrid', iso)
+        raise(Foreman::Exception, N_('ISO hybrid conversion failed')) unless system('isohybrid', iso)
 
         yield iso
       end
@@ -156,7 +156,7 @@ module ForemanBootdisk
                 # prevent multiple writes to the cache
                 write_cache = false
               else
-                raise(::Foreman::Exception.new N_("Unable to download boot file %{uri}, HTTP return code %{code}" % { uri: uri, code: response.code }))
+                raise ::Foreman::Exception, N_(format("Unable to download boot file %{uri}, HTTP return code %{code}", uri: uri, code: response.code))
               end
             end
           end

data/app/views/foreman_bootdisk/generic_static_host.erb

@@ -0,0 +1,34 @@
+#!ipxe
+#
+# Generic host template with interactive static IP configuration. Tokens
+# must be disabled in order to access templates via MAC addresses.
+#
+
+<% (0..32).each do |i| -%>
+:net<%= i %>
+isset ${net<%= i -%>/mac} || goto configure
+echo Found ${net<%= i -%>/mac} as net<%= i -%> on a ${net<%= i -%>/chip}
+goto net<%= i+1 %>
+<% end -%>
+
+:configure
+echo -n Interface (e.g. net0): && read interface
+iseq ${interface} n && goto reboot ||
+iseq ${interface} N && goto reboot ||
+
+ifopen ${interface}
+echo Please enter IPv4 details for ${interface}
+echo
+
+echo -n IP address:  && read ${interface}/ip
+echo -n Subnet mask:  && read ${interface}/netmask
+echo -n Default gateway:  && read ${interface}/gateway
+echo -n DNS server:  && read dns
+
+chain <%= bootdisk_chain_url %>${${interface}/mac} || goto reboot
+exit 0
+
+:reboot
+echo Unable to continue, rebooting...
+sleep 30
+exit 1

data/db/seeds.d/50-bootdisk_templates.rb

@@ -1,32 +1,12 @@
 # frozen_string_literal: true
 
-kind = TemplateKind.unscoped.where(name: 'Bootdisk').first_or_create
-
-organizations = Organization.all
-locations = Location.all
-created = []
-
-ProvisioningTemplate.without_auditing do
-  content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'host.erb'))
-  created << 'Boot disk iPXE - host' unless ProvisioningTemplate.find_by(name: 'Boot disk iPXE - host')
-  tmpl = ProvisioningTemplate.unscoped.where(name: 'Boot disk iPXE - host').first_or_create do |template|
-    template.attributes = {
-      template_kind_id: kind.id,
-      snippet: false,
-      template: content
-    }
-  end
-  tmpl.attributes = {
-    template: content,
-    default: true,
-    vendor: 'Foreman boot disk'
-  }
-  tmpl.locked = true
-  tmpl.save!(validate: false) if tmpl.changes.present?
+def read_bootdisk_template(filename)
+  File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', filename))
+end
 
-  content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'generic_host.erb'))
-  created << 'Boot disk iPXE - generic host' unless ProvisioningTemplate.find_by(name: 'Boot disk iPXE - generic host')
-  tmpl = ProvisioningTemplate.unscoped.where(name: 'Boot disk iPXE - generic host').first_or_create do |template|
+def ensure_bootdisk_template(name, content)
+  kind = TemplateKind.unscoped.where(name: 'Bootdisk').first_or_create
+  tmpl = ProvisioningTemplate.unscoped.where(name: name).first_or_create do |template|
     template.attributes = {
       template_kind_id: kind.id,
       snippet: false,
@@ -36,13 +16,16 @@ ProvisioningTemplate.without_auditing do
   tmpl.attributes = {
     template: content,
     default: true,
-    vendor: 'Foreman boot disk'
+    vendor: "Foreman boot disk"
   }
   tmpl.locked = true
+  tmpl.organizations = Organization.unscoped.all if SETTINGS[:organizations_enabled]
+  tmpl.locations = Location.unscoped.all if SETTINGS[:locations_enabled]
   tmpl.save!(validate: false) if tmpl.changes.present?
+end
 
-  ProvisioningTemplate.unscoped.where(name: created, default: true).each do |template|
-    template.organizations = organizations if SETTINGS[:organizations_enabled]
-    template.locations = locations if SETTINGS[:locations_enabled]
-  end
+ProvisioningTemplate.without_auditing do
+  ensure_bootdisk_template("Boot disk iPXE - host", read_bootdisk_template("host.erb"))
+  ensure_bootdisk_template("Boot disk iPXE - generic host", read_bootdisk_template("generic_host.erb"))
+  ensure_bootdisk_template("Boot disk iPXE - generic static host", read_bootdisk_template("generic_static_host.erb"))
 end

data/lib/foreman_bootdisk/engine.rb

@@ -38,7 +38,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.22'
+        requires_foreman '>= 1.24'
 
         security_block :bootdisk do |_map|
           permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host subnet help],
@@ -53,7 +53,7 @@ module ForemanBootdisk
         apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
         provision_method 'bootdisk', N_('Boot disk based')
         template_labels 'Bootdisk' => N_('Boot disk embedded template')
-        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
+        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise, :bootdisk_build?
       end
     end
 

data/lib/foreman_bootdisk/version.rb

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

data/locale/ca/foreman_bootdisk.po

@@ -7,9 +7,9 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 15.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-04-18 20:22+0000\n"
+"PO-Revision-Date: 2019-08-12 08:51+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
@@ -22,6 +22,9 @@ msgstr ""
 msgid "A variant of the per-host image which contains the OS bootloader embedded inside the disk.  This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or PXELinux templates."
 msgstr ""
 
+msgid "Action with sub plans"
+msgstr ""
+
 msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
 msgstr ""
 
@@ -46,6 +49,9 @@ msgstr ""
 msgid "Boot disks"
 msgstr "Discs d'arrencada"
 
+msgid "Both IP and Subnet must be set"
+msgstr ""
+
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "L'ordre per generar la imatge ISO, utilitzeu genisoimage o mkisofs"
 
@@ -94,8 +100,11 @@ msgstr "Ajuda"
 msgid "Host '%s' image"
 msgstr ""
 
-msgid "Host has no IP address defined"
-msgstr "L'amfitrió no té definida cap adreça IP"
+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"
 msgstr "L'amfitrió no té definit cap domini"
@@ -127,6 +136,12 @@ msgstr ""
 msgid "ISOLINUX directory"
 msgstr ""
 
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -157,6 +172,9 @@ msgstr ""
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr ""
 
+msgid "Remote action:"
+msgstr ""
+
 msgid "SYSLINUX directory"
 msgstr ""
 

data/locale/de/foreman_bootdisk.po

@@ -12,9 +12,9 @@
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 15.0.0\n"
+"Project-Id-Version: foreman_bootdisk 15.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-04-18 20:22+0000\n"
+"PO-Revision-Date: 2019-08-12 08:51+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -26,6 +26,9 @@ msgstr ""
 msgid "A variant of the per-host image which contains the OS bootloader embedded inside the disk.  This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or PXELinux templates."
 msgstr "Eine Variante des Abbildes pro Host mit im im Medium eingebetteten Betriebssystem-Bootloader. Dies ist hilfreich, falls Chainloading auf einer bestimmten Hardware fehlschlägt, hat jedoch den Nachteil, dass das Abbild bei jeglicher Änderung von Betriebssystem, Bootloader oder PXELinux-Vorlagen neu generiert werden muss."
 
+msgid "Action with sub plans"
+msgstr ""
+
 msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
 msgstr "Alle Abbilder können entweder als ISOs oder als Festplattenabbilder verwendet werden und auch mit `dd` auf eine USB-Festplatte geschrieben."
 
@@ -50,6 +53,9 @@ msgstr "Im Startmedium eingebettete Vorlage"
 msgid "Boot disks"
 msgstr "Startmedien"
 
+msgid "Both IP and Subnet must be set"
+msgstr ""
+
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "Kommando zur Erstellung von ISO-Abbildern, verwende genisoimage oder mkisofs"
 
@@ -98,8 +104,11 @@ msgstr "Hilfe"
 msgid "Host '%s' image"
 msgstr "Host '%s'-Abbild"
 
-msgid "Host has no IP address defined"
-msgstr "Host hat keine IP-Adresse definiert"
+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"
 msgstr "Host hat keine Domäne definiert"
@@ -131,6 +140,12 @@ msgstr "ISO hybrid Konvertierung fehlgeschlagen"
 msgid "ISOLINUX directory"
 msgstr "ISOLINUX-Verzeichnis"
 
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr "Installationsmedien-Dateien Caching"
 
@@ -161,6 +176,9 @@ msgstr "Bitte die Installation des/der ISOLINUX/SYSLINUX Paket(e) sicherstellen.
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin für Foreman, welches iPXE-basierte Startmedien erstellt, um Hosts ohne die Notwendigkeit einer PXE-Infrastruktur bereitzustellen."
 
+msgid "Remote action:"
+msgstr ""
+
 msgid "SYSLINUX directory"
 msgstr "SYSLINUX-Verzeichnis"