foreman_bootdisk 14.0.0 → 17.0.2

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,20 +39,22 @@ 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
 
-<% if interface.subnet.dns_primary.present? %>
-# Note, iPXE can only use one DNS server
-echo Using DNS <%= interface.subnet.dns_primary %>
-set dns <%= interface.subnet.dns_primary %>
+# Note: When multiple DNS servers are specified, only the first
+# server will be used. See: http://ipxe.org/cfg/dns
+<% if dns.present? -%>
+echo Using DNS <%= dns %>
+set dns <%= dns %>
 set domain <%= interface.domain.to_s %>
 <% end %>
 

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,17 @@ 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 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,7 +38,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.20'
+        requires_foreman '>= 2.1'
 
         security_block :bootdisk do |_map|
           permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host subnet help],
@@ -46,7 +46,7 @@ module ForemanBootdisk
                                          '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
 
@@ -65,10 +65,10 @@ 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
+        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 = '14.0.0'
+  VERSION = '17.0.2'
 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}"
@@ -93,6 +96,7 @@ namespace :foreman_bootdisk do
         task.patterns = ["#{ForemanBootdisk::Engine.root}/app/**/*.rb",
                          "#{ForemanBootdisk::Engine.root}/lib/**/*.rb",
                          "#{ForemanBootdisk::Engine.root}/test/**/*.rb"]
+        task.options << '--auto-correct' if ENV['RUBOCOP_AUTOCORRECT']
       end
     rescue StandardError
       puts 'Rubocop not loaded.'

data/locale/action_names.rb

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

data/locale/ca/foreman_bootdisk.po

@@ -3,12 +3,13 @@
 # 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
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_bootdisk 17.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-20 00:09+0000\n"
+"PO-Revision-Date: 2019-10-22 20:06+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
@@ -21,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 ""
 
@@ -45,9 +49,18 @@ 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"
 
+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"
 
@@ -57,9 +70,21 @@ msgstr "Baixa la imatge d'amfitrió"
 msgid "Download subnet generic image"
 msgstr "Baixa la imatge genèrica de subxarxa"
 
+msgid "Ensure %{path} contains grubx64.efi and shimx64.efi: install TFTP module or copy those files into /var/lib/foreman/bootdisk (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 ""
 
@@ -78,6 +103,9 @@ 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"
 
@@ -87,14 +115,23 @@ 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 "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
+
 msgid "Help"
 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"
@@ -115,17 +152,23 @@ msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr ""
 
 msgid "ISO build failed"
-msgstr "No s'ha pogut construir la ISO"
+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"
 msgstr ""
 
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -135,11 +178,14 @@ msgstr "Els fitxers dels mitjans d'instal·lació s'emmagatzemaran en memòria c
 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"
 
 msgid "Path to directory containing isolinux images"
-msgstr ""
+msgstr "El camí al directori que conté les imatges isolinux"
 
 msgid "Path to directory containing syslinux images"
 msgstr "El camí al directori que conté les imatges syslinux"
@@ -156,18 +202,15 @@ 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 ""
 
 msgid "Subnet '%s' generic image"
 msgstr ""
 
-msgid "Subnet (%s) has no gateway defined"
-msgstr "La subxarxa (%s) no té definida cap passarel·la"
-
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr "La subxarxa (%s) no té definit cap servidor DNS primari"
-
 msgid "Subnet boot disks"
 msgstr "Discs d'arrencada de subxarxa"
 
@@ -195,8 +238,14 @@ 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 template: %s"
-msgstr "No es pot generar la plantilla de disc: %s"
+msgid "Unable to generate disk %{kind} template: %{error}"
+msgstr ""
+
+msgid "Unable to generate disk template, %{kind} template not found."
+msgstr ""
+
+msgid "Unable to mcopy %{path}"
+msgstr ""
 
 msgid "Upload ISO image to datastore for %s"
 msgstr ""
@@ -205,7 +254,7 @@ msgid "Various types of boot disks can be created to provision hosts without the
 msgstr ""
 
 msgid "iPXE directory"
-msgstr ""
+msgstr "Directori iPXE"
 
 msgid "iPXE template to use for generic host boot disks"
 msgstr ""

data/locale/de/foreman_bootdisk.po

@@ -5,13 +5,16 @@
 # Translators:
 # Christina Gurski <Gurski_christina@yahoo.de>, 2015
 # Ettore Atalan <atalanttore@googlemail.com>, 2014,2016
+# Martin Zimmermann <martin.zimmermann@gmx.com>, 2018
 # Paul Puschmann, 2014
-# simon11 <simon.stieger.98@live.de>, 2014
+# abf90805572190d649c59f7a021d76cb, 2014
+# simon11 <transifex@stieger.co>, 2014
+# simon11 <transifex@stieger.co>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_bootdisk 17.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-20 00:09+0000\n"
+"PO-Revision-Date: 2019-10-22 20:06+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -23,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 "Aktion mit Unterplänen"
+
 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."
 
@@ -39,17 +45,26 @@ msgid "Boot disk based"
 msgstr "Startmedium-basiert"
 
 msgid "Boot disk download not available for %s architecture"
-msgstr ""
+msgstr "Startmedium Download nicht verfügbar für Architektur %s"
 
 msgid "Boot disk embedded template"
-msgstr ""
+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"
 
+msgid "Creating new image failed, install truncate utility"
+msgstr ""
+
+msgid "Detach ISO image from CDROM drive for %s"
+msgstr ""
+
 msgid "Download generic image"
 msgstr "Generisches Abbild herunterladen"
 
@@ -59,17 +74,29 @@ msgstr "Host-Abbild herunterladen"
 msgid "Download subnet generic image"
 msgstr "Generisches Abbild von Subnetz herunterladen"
 
+msgid "Ensure %{path} contains grubx64.efi and shimx64.efi: install TFTP module or copy those files into /var/lib/foreman/bootdisk (Grub2 directory setting)"
+msgstr ""
+
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
+msgstr "Fehler beim Einhängen des ISO-Abbild am CDROM-Laufwerk für Instanz %{name}: %{message}"
+
+msgid "Failed to create a directory within the ESP image"
 msgstr ""
 
-msgid "Failed to generate ISO image for instance %{name}: %{message}"
+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 "Fehler beim Erzeugen des ISO-Abbild für Instanz %{name}: %{message}"
+
 msgid "Failed to render boot disk template"
 msgstr "Fehler beim Rendern der Vorlage für Startmedium"
 
 msgid "Failed to upload ISO image for instance %{name}: %{message}"
-msgstr ""
+msgstr "Fehler beim Upload des ISO-Abbild für Instanz %{name}: %{message}"
 
 msgid "Full host '%s' image"
 msgstr "Vollständiges Host \"%s\"-Abbild"
@@ -80,6 +107,9 @@ msgstr "Vollständiges Host-Abbild"
 msgid "Generating ISO image for %s"
 msgstr "ISO-Abbild für %s wird erzeugt"
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "Generisches Abbild"
 
@@ -89,14 +119,23 @@ msgstr "Generische Abbildvorlage"
 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 "Generische Abbilder sind wiederverwendbare Festplattenabbilder die für beliebige in Foreman registrierte Hosts funktionieren. Sie erfordern einen einfachen DHCP- und DNS-Service, um zu funktionieren und den Server zu kontaktieren. Jedoch benötigen sie keinerlei DHCP-Reservierungen oder statische IP-Adressen."
 
+msgid "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
+
 msgid "Help"
 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"
@@ -122,14 +161,20 @@ msgstr "ISO-Erstellung fehlgeschlagen"
 msgid "ISO generation command"
 msgstr "ISO-Erzeugungsbefehl"
 
-msgid "ISO hybrid conversion failed"
-msgstr "ISO hybrid Konvertierung fehlgeschlagen"
+msgid "ISO hybrid conversion failed: %s"
+msgstr ""
 
 msgid "ISOLINUX directory"
 msgstr "ISOLINUX-Verzeichnis"
 
+msgid "Import Puppet classes"
+msgstr "Puppet-Klassen importieren"
+
+msgid "Import facts"
+msgstr "Fakten importieren"
+
 msgid "Installation media caching"
-msgstr ""
+msgstr "Installationsmedien-Dateien Caching"
 
 msgid "Installation media files will be cached for full host images"
 msgstr "Installationsmedien-Dateien werden für vollständige Host-Images zwischengespeichert."
@@ -137,11 +182,14 @@ msgstr "Installationsmedien-Dateien werden für vollständige Host-Images zwisch
 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 "Sobald sie nacheinander geladen (Chainloading) sind, werden der OS-Bootloader und das OS-Installationsprogramm direkt von den in Foreman konfigurierten Installationsmedien heruntergeladen, und das Bereitstellungsskript (kickstart/preseed) wird von Foreman heruntergeladen."
 
+msgid "Path to directory containing grubx64.efi and shimx64.efi"
+msgstr ""
+
 msgid "Path to directory containing iPXE images"
 msgstr "Pfad zum Verzeichnis mit iPXE-Abbildern"
 
 msgid "Path to directory containing isolinux images"
-msgstr ""
+msgstr "Pfad zum Verzeichnis welches die ISOLINUX Abbilder enthält"
 
 msgid "Path to directory containing syslinux images"
 msgstr "Pfad zum Verzeichnis mit syslinux-Abbildern"
@@ -150,26 +198,23 @@ msgid "Per-host images contain data about a particular host registered in Forema
 msgstr "\"Pro-Host\"-Abbilder enthalten Daten über einen bestimmten Host, der in Foreman registriert ist, und richten eine vollständig statische Verbindung ein, wobei die Notwendigkeit von DHCP vermieden wird. Nach der Konfiguration der Verbindung werden sie nacheinander von Foreman geladen (Chainloading) und nehmen die gegenwärtige OS-Konfiguration und den Buildstatus vom Server auf."
 
 msgid "Please ensure the ipxe-bootimgs package is installed."
-msgstr ""
+msgstr "Bitte die Installation des IPXE-bootimgs Paket sicherstellen."
 
 msgid "Please ensure the isolinux/syslinux package(s) are installed."
-msgstr ""
+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 "Entfernte Aktion:"
+
 msgid "SYSLINUX directory"
 msgstr "SYSLINUX-Verzeichnis"
 
 msgid "Subnet '%s' generic image"
 msgstr "Subnetz '%s' generisches Abbild"
 
-msgid "Subnet (%s) has no gateway defined"
-msgstr "Subnetz (%s) hat keinen Gateway definiert"
-
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr "Subnetz (%s) hat keinen primären DNS-Server definiert"
-
 msgid "Subnet boot disks"
 msgstr "Subnetz-Startmedien"
 
@@ -197,8 +242,14 @@ msgstr "\"True\" für vollständiges, \"false\" für einfaches wiederverwendbare
 msgid "Unable to find template specified by %s setting"
 msgstr "Konnte Vorlage mit der %s-Einstellung nicht finden"
 
-msgid "Unable to generate disk template: %s"
-msgstr "Startmedium-Vorlage konnte nicht erzeugt werden: %s"
+msgid "Unable to generate disk %{kind} template: %{error}"
+msgstr ""
+
+msgid "Unable to generate disk template, %{kind} template not found."
+msgstr ""
+
+msgid "Unable to mcopy %{path}"
+msgstr ""
 
 msgid "Upload ISO image to datastore for %s"
 msgstr "ISO-Abbild zum Datenspeicher für %s hochladen"