foreman_bootdisk 16.0.0 → 18.0.0

data/app/views/foreman_bootdisk/generic_efi_host.erb

@@ -0,0 +1,68 @@
+#
+# Boot disk Grub2 EFI - generic host
+#
+#set debug="http,efinet,net"
+#set debug=all
+echo "Foreman Bootdisk: 'Boot disk Grub2 EFI - generic host' template"
+echo
+echo "********************************************************"
+echo " REQUIREMENTS:"
+echo " * SUBNET GENERIC IMAGE ONLY (host image not supported)"
+echo " * HOST PARAM default_grub_install_entry set to efi_http"
+echo " * PROXY WITH HTTPBOOT FEATURE"
+echo " * HTTP UEFI BOOT ONLY (Legacy/PXE not supported)"
+echo " * IPv4 ONLY (IPv6 not tested, change the template)"
+echo " * HTTP ONLY (change the template for HTTPS)"
+echo " * ISC DHCP (other servers not tested)"
+echo " * GRUB FROM RHEL 8.3+/7.9+ (when generating the image)"
+echo " * EFI HTTP or HTTPS grub entry must be selected in menu"
+echo " * DNS must resolve proxy hostname via DNS proxy if set"
+echo "*******************************************************"
+sleep 5
+<%
+# possible values are: "http" or "https"
+proxy_proto = "http"
+
+@subnet || bootdisk_raise("Generic disk not supported for EFI, use subnet disk")
+@subnet.template? || bootdisk_raise("Requires a proxy with template feature")
+proxy_port = if proxy_proto == "http"
+  @subnet.httpboot.httpboot_http_port
+else
+  @subnet.httpboot.httpboot_https_port
+end
+# Workaround for "no DNS server configured" https://bugzilla.redhat.com/show_bug.cgi?id=1842509
+proxy_httpboot_host = dns_lookup(@subnet.httpboot.hostname)
+proxy_template_host = dns_lookup(@subnet.template.hostname)
+-%>
+echo
+net_ls_cards
+echo "Configuring ALL cards via BOOTP/IPv4"
+net_bootp
+# uncomment here for IPv6 support (not tested)
+#echo "Configuring ALL cards via BOOTP/IPv6"
+#net_ipv6_autoconf
+net_ls_addr
+net_ls_routes
+net_ls_dns
+echo Trying to ping proxy_httpboot_host: <%= proxy_httpboot_host %>
+ping --count 1 <%= proxy_httpboot_host %> || echo Ping to proxy_httpboot_host failed or ping command not available.
+echo Trying to ping proxy_template_host: <%= proxy_template_host %>
+ping --count 1 <%= proxy_template_host %> || echo Ping to proxy_template_host failed or ping command not available.
+sleep 5
+set root=(<%= proxy_proto %>,<%= proxy_httpboot_host %>:<%= proxy_port %>)
+# The variable will not survive configfile fetch, therefore absolute path
+# must be used in the chainloaded template.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1842893
+set http_path=/httpboot/
+set default=efi_<%= proxy_proto %>
+<% (0..32).each do |i| -%>
+  echo "Trying efinet<%= i %> via <%= proxy_proto %>://<%= proxy_template_host %>:<%= proxy_port %>/unattended/PXEGrub2?mac=$net_efinet<%= i %>_dhcp_mac"
+  set net_default_mac=$net_efinet<%= i %>_dhcp_mac
+  sleep 5
+  configfile (<%= proxy_proto %>,<%= proxy_template_host %>:<%= proxy_port %>)/unattended/PXEGrub2?mac=$net_efinet<%= i %>_dhcp_mac
+<% end -%>
+
+echo "Could not find a host with PXEGrub2 template and one of the MAC addresses!"
+echo "The system will poweroff in few minutes..."
+sleep 500
+poweroff

data/app/views/foreman_bootdisk/host.erb

@@ -58,6 +58,13 @@ set dns <%= dns %>
 set domain <%= interface.domain.to_s %>
 <% end %>
 
+echo Trying to ping Gateway: ${netX/gateway}
+ping --count 1 ${netX/gateway} || echo Ping to Gateway failed or ping command not available.
+<% if dns.present? -%>
+echo Trying to ping DNS: ${netX/dns}
+ping --count 1 ${netX/dns} || echo Ping to DNS failed or ping command not available.
+<% end %>
+
 # Chainload from Foreman rather than embedding OS info here, so the behaviour
 # is entirely dynamic.
 chain <%= bootdisk_chain_url %>

data/app/views/subnets/_bootdisk_action_buttons.erb

@@ -0,0 +1 @@
+<%= display_bootdisk_for_subnet(subject) %>

data/app/views/subnets/_bootdisk_title_buttons.erb

@@ -0,0 +1 @@
+<%= display_bootdisk_title_buttons %>

data/config/routes.rb

@@ -7,7 +7,7 @@ ForemanBootdisk::Engine.routes.draw do
     constraints(id: %r{[^/]+}) do
       get 'hosts/:id', on: :collection, to: 'disks#host'
       get 'full_hosts/:id', on: :collection, to: 'disks#full_host'
-      get 'subnet/:id', on: :collection, to: 'disks#subnet'
+      get 'subnet/:id', on: :collection, to: 'subnet_disks#subnet'
     end
   end
 

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

@@ -27,5 +27,6 @@ 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 Grub2 EFI - generic host", read_bootdisk_template("generic_efi_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,22 +38,31 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.24'
+        requires_foreman '>= 3.0'
 
         security_block :bootdisk do |_map|
-          permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host subnet help],
+          permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host help],
+                                         'foreman_bootdisk/subnet_disks': [:subnet],
                                          'foreman_bootdisk/api/v2/disks': %i[generic host],
                                          'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
         end
 
-        role 'Boot disk access', [:download_bootdisk]
+        role 'Boot disk access', [:download_bootdisk], 'Role granting permissions to download bootdisks'
 
         add_all_permissions_to_default_roles
 
         apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
+        ApipieDSL.configuration.dsl_classes_matchers += [
+          "#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
+        ]
         provision_method 'bootdisk', N_('Boot disk based')
         template_labels 'Bootdisk' => N_('Boot disk embedded template')
-        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise, :bootdisk_build?
+        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
+
+        extend_page "subnets/index" do |cx|
+          cx.add_pagelet :subnet_index_action_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_action_buttons'
+          cx.add_pagelet :subnet_index_title_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_title_buttons'
+        end
       end
     end
 
@@ -65,10 +74,11 @@ module ForemanBootdisk
 
     config.to_prepare do
       begin
-        Host::Managed.send(:prepend, ForemanBootdisk::HostExt)
-        Host::Managed.send(:include, ForemanBootdisk::Orchestration::Compute) if SETTINGS[:unattended]
-        HostsHelper.send(:prepend, ForemanBootdisk::HostsHelperExt)
-        Foreman::Model::Vmware.send(:prepend, ForemanBootdisk::ComputeResources::Vmware) if Foreman::Model::Vmware.available?
+        Host::Managed.prepend ForemanBootdisk::HostExt
+        Host::Managed.include ForemanBootdisk::Orchestration::Compute if SETTINGS[:unattended]
+        HostsHelper.prepend ForemanBootdisk::HostsHelperExt
+        SubnetsHelper.prepend ForemanBootdisk::SubnetsHelperExt
+        Foreman::Model::Vmware.prepend ForemanBootdisk::ComputeResources::Vmware if Foreman::Model::Vmware.available?
       rescue StandardError => e
         Rails.logger.warn "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e})"
       end

data/lib/foreman_bootdisk/version.rb

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

data/lib/tasks/bootdisk.rake

@@ -20,9 +20,10 @@ namespace :bootdisk do
     task host: :environment do
       User.as_anonymous_admin do
         host = Host::Base.unscoped.find_by(name: ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
-        tmpl = host.bootdisk_template_render
+        tmpl_bios = host.bootdisk_template_render
+        tmpl_efi = host.generic_efi_template_render
 
-        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl, dir: outputdir) do |image|
+        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl_bios, grub: tmpl_efi, dir: outputdir) do |image|
           output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}.iso")
           FileUtils.mv image, output
           puts "Wrote #{output}"
@@ -45,9 +46,9 @@ namespace :bootdisk do
     desc 'Generate a generic boot disk.  OUTPUT=path'
     task generic: :environment do
       User.as_anonymous_admin do
-        tmpl = ForemanBootdisk::Renderer.new.generic_template_render
+        tmpl_bios = ForemanBootdisk::Renderer.new.generic_template_render
 
-        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl, dir: outputdir) do |image|
+        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl_bios, dir: outputdir) do |image|
           output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso")
           FileUtils.cp image, output
           puts "Wrote #{output}"
@@ -60,8 +61,10 @@ namespace :bootdisk do
       User.as_anonymous_admin do
         subnet = Subnet.unscoped.find_by(name: ENV['NAME']) || raise("cannot find subnet '#{ENV['NAME']}', specify NAME=subnet")
         subnet.tftp || raise(::Foreman::Exception.new(N_('TFTP feature not enabled for subnet %s'), subnet.name))
-        tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
-        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl, dir: outputdir) do |image|
+        subnet.httpboot || ForemanBootdisk.logger.warn('HTTPBOOT feature is not enabled for subnet %s, UEFI may not be available for bootdisk' % subnet.name)
+        tmpl_bios = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
+        tmpl_efi = ForemanBootdisk::Renderer.new.generic_efi_template_render(subnet)
+        ForemanBootdisk::ISOGenerator.generate(ipxe: tmpl_bios, grub: tmpl_efi, dir: outputdir) do |image|
           output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_subnet_#{subnet.name}.iso")
           FileUtils.cp image, output
           puts "Wrote #{output}"
@@ -85,22 +88,5 @@ end
 
 Rake::Task[:test].enhance ['test:foreman_bootdisk']
 
-namespace :foreman_bootdisk do
-  task :rubocop do
-    begin
-      require 'rubocop/rake_task'
-      RuboCop::RakeTask.new(:rubocop_foreman_bootdisk) do |task|
-        task.patterns = ["#{ForemanBootdisk::Engine.root}/app/**/*.rb",
-                         "#{ForemanBootdisk::Engine.root}/lib/**/*.rb",
-                         "#{ForemanBootdisk::Engine.root}/test/**/*.rb"]
-      end
-    rescue StandardError
-      puts 'Rubocop not loaded.'
-    end
-
-    Rake::Task['rubocop_foreman_bootdisk'].invoke
-  end
-end
-
 load 'tasks/jenkins.rake'
-Rake::Task['jenkins:unit'].enhance ['test:foreman_bootdisk', 'foreman_bootdisk:rubocop'] if Rake::Task.task_defined?(:'jenkins:unit')
+Rake::Task['jenkins:unit'].enhance ['test:foreman_bootdisk'] if Rake::Task.task_defined?(:'jenkins:unit')

data/locale/action_names.rb

@@ -0,0 +1,5 @@
+# Autogenerated!
+_("Remote action:")
+_("Import Puppet classes")
+_("Import facts")
+_("Action with sub plans")

data/locale/ca/foreman_bootdisk.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the foreman_bootdisk package.
 #
 # Translators:
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 15.1.0\n"
+"Project-Id-Version: foreman_bootdisk 18.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-08-12 08:51+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"PO-Revision-Date: 2021-04-29 10:23+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,9 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid "* - These bootdisk types were disabled, you can enable them in Administer - Settings."
+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 ""
 
@@ -28,6 +31,9 @@ msgstr ""
 msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
 msgstr ""
 
+msgid "Allowed bootdisk types"
+msgstr ""
+
 msgid "Attach ISO image to CDROM drive for %s"
 msgstr ""
 
@@ -37,6 +43,9 @@ msgstr "Enrere"
 msgid "Boot disk"
 msgstr "Disc d'arrencada"
 
+msgid "Boot disk Help"
+msgstr ""
+
 msgid "Boot disk based"
 msgstr ""
 
@@ -55,6 +64,12 @@ msgstr ""
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "L'ordre per generar la imatge ISO, utilitzeu genisoimage o mkisofs"
 
+msgid "Creating new image failed, install truncate utility"
+msgstr ""
+
+msgid "Detach ISO image from CDROM drive for %s"
+msgstr ""
+
 msgid "Download generic image"
 msgstr "Baixa la imatge genèrica"
 
@@ -64,9 +79,21 @@ msgstr "Baixa la imatge d'amfitrió"
 msgid "Download subnet generic image"
 msgstr "Baixa la imatge genèrica de subxarxa"
 
+msgid "Ensure %{file} is readable (or update \"Grub2 directory\" setting)"
+msgstr ""
+
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
 msgstr ""
 
+msgid "Failed to create a directory within the ESP image"
+msgstr ""
+
+msgid "Failed to detach ISO image from CDROM drive of instance %{name}: %{message}"
+msgstr ""
+
+msgid "Failed to format the ESP image via mkfs.msdos"
+msgstr ""
+
 msgid "Failed to generate ISO image for instance %{name}: %{message}"
 msgstr ""
 
@@ -85,17 +112,26 @@ msgstr "Imatge completa d'amfitrió"
 msgid "Generating ISO image for %s"
 msgstr ""
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "Imatge genèrica"
 
 msgid "Generic image template"
 msgstr ""
 
+msgid "Generic images"
+msgstr ""
+
 msgid "Generic images are a reusable disk image that works for any host registered in Foreman.  It requires a basic DHCP and DNS service to function and contact the server, but does not require DHCP reservations or static IP addresses."
 msgstr ""
 
-msgid "Help"
-msgstr "Ajuda"
+msgid "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
 
 msgid "Host '%s' image"
 msgstr ""
@@ -121,16 +157,25 @@ msgstr "Imatge d'amfitrió"
 msgid "Host image template"
 msgstr ""
 
+msgid "Host images"
+msgstr ""
+
+msgid "Host is not in build mode"
+msgstr ""
+
 msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr ""
 
+msgid "Host is not in build mode."
+msgstr ""
+
 msgid "ISO build failed"
 msgstr "No s'ha pogut construir l'ISO"
 
 msgid "ISO generation command"
 msgstr ""
 
-msgid "ISO hybrid conversion failed"
+msgid "ISO hybrid conversion failed: %s"
 msgstr ""
 
 msgid "ISOLINUX directory"
@@ -148,9 +193,15 @@ msgstr ""
 msgid "Installation media files will be cached for full host images"
 msgstr "Els fitxers dels mitjans d'instal·lació s'emmagatzemaran en memòria cau per a les imatges completes dels amfitrions"
 
+msgid "List of allowed bootdisk types, remove type to disable it"
+msgstr ""
+
 msgid "Once chainloaded, the OS bootloader and installer are downloaded directly from the installation media configured in Foreman, and the provisioning script (kickstart/preseed) is downloaded from Foreman."
 msgstr ""
 
+msgid "Path to directory containing grubx64.efi and shimx64.efi"
+msgstr ""
+
 msgid "Path to directory containing iPXE images"
 msgstr "El camí al directori que conté les imatges iPXE"
 
@@ -184,34 +235,46 @@ msgstr ""
 msgid "Subnet boot disks"
 msgstr "Discs d'arrencada de subxarxa"
 
+msgid "Subnet generic image"
+msgstr ""
+
 msgid "Subnet image"
 msgstr "Imatge de subxarxa"
 
 msgid "Subnet images are similar to generic images, but chain-loading is done via the TFTP Smart Proxy assigned to the Subnet of the host. The smart proxy must have the \"Templates\" module enabled and configured."
 msgstr ""
 
-msgid "Subnet is not assigned to the host %s"
-msgstr "La subxarxa no està assignada a l'amfitrió %s"
-
 msgid "TFTP feature not enabled for subnet %s"
 msgstr "La funcionalitat TFTP no està habilitada per a la subxarxa %s"
 
 msgid "The OS install continues using the installation media configured in Foreman, and it will typically configure static networking, depending on how the OS iPXE template is configured."
 msgstr ""
 
+msgid "These images are more generic than previous images. You can find them at subnet index page."
+msgstr ""
+
+msgid "These images are used for host. You can find them at host detail page."
+msgstr ""
+
 msgid "This image is generic for all hosts with a provisioning NIC on that subnet."
 msgstr ""
 
+msgid "This type of bootdisk is not allowed. Please contact administrator."
+msgstr ""
+
 msgid "True for full, false for basic reusable image"
 msgstr ""
 
 msgid "Unable to find template specified by %s setting"
 msgstr "No es pot trobar la plantilla especificada per l'ajust %s"
 
-msgid "Unable to generate disk PXELinux template: %s"
+msgid "Unable to generate disk %{kind} template: %{error}"
+msgstr ""
+
+msgid "Unable to generate disk template, %{kind} template not found."
 msgstr ""
 
-msgid "Unable to generate disk template, PXELinux template not found."
+msgid "Unable to mcopy %{file}"
 msgstr ""
 
 msgid "Upload ISO image to datastore for %s"