foreman_bootdisk 14.0.0 → 15.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7cc51c2b0f332b25d13f49d22c813c0ed28fb9b6e34238a7f44cfd40eddda1
-  data.tar.gz: f46b68427bbd016563ef186a9ed2cacbaf8f271c8da421db5f7eefb21eb363c6
+  metadata.gz: 4733307c911d25a22301bdb3527422e04e4ab2491c2210b914f3c27d00ca1ea2
+  data.tar.gz: 14955cfafbe62b393e45927a36805173a00e41f8bf0e4868f7f11026bc260fac
 SHA512:
-  metadata.gz: cefbdba361acd20cdfb1a9137010da3290b8170fe9bf8bafc9f786f514acb7b81a5b448f4b8f794d5416800f5cdcf3faad55693efd6672fbe454375ae84ecf3c
-  data.tar.gz: b00a6e9af217a60d776508e3e076077729ebd0360cf3bdb246a71be9e307abeef10bc42c46a68f23834153a8fa86123eeb14cfafe007aa29c77b38087a3f612f
+  metadata.gz: b605a6809d4cfa2c2fee39e1744c54f4114b1b05d64e46e983cf2f4d3344766b4173d6a4519e1758e2afc30d0f0aa12b64e013208d2f706828ae8aa8fb8381d7
+  data.tar.gz: 2497d42c876c57097cde13de621696b3fb60140238ef00585e49e76980a6d28d12bd0c4931120648f2af20ef55d9f9865522eb59a2a74a71673d3634a169e66d

data/AUTHORS

@@ -0,0 +1,23 @@
+Bryan Kearney
+Dominic Cleal
+Greg Sutcliffe
+Ido Kanner
+Jon Fautley
+Justin Sherrill
+Lukas Zapletal
+Lukáš Zapletal
+Marek Hulan
+Marek Hulán
+Martin Bačovský
+Michael Hofer
+Michael Moll
+Ohad Levy
+Ondrej Prazak
+Ondřej Pražák
+Robert Antoni Buj Gelonch
+Ronald van Zantvoort
+Sam Kottler
+Sean O'Keeffe
+Stephen Benjamin
+Swapnil Abnave
+Timo Goebel

data/app/models/concerns/foreman_bootdisk/host_ext.rb

@@ -36,10 +36,6 @@ module ForemanBootdisk
       /i.86|x86[_-]64/ =~ architecture.name
     end
 
-    def validate_media?
-      super || (managed && bootdisk_build? && build?)
-    end
-
     def can_be_built?
       super || (managed? && SETTINGS[:unattended] && bootdisk_build? && !build?)
     end

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -121,7 +121,7 @@ module ForemanBootdisk
       '_' + expiry.strftime('%Y%m%d_%H%M')
     end
 
-    def self.fetch(path, uri)
+    def self.fetch(path, uri, limit = 10)
       dir = File.dirname(path)
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
 
@@ -138,11 +138,22 @@ module ForemanBootdisk
           write_cache = use_cache
           uri = URI(uri)
           Net::HTTP.start(uri.host, uri.port) do |http|
-            request = Net::HTTP::Get.new(uri.request_uri)
+            request = Net::HTTP::Get.new(uri.request_uri, 'Accept-Encoding' => 'plain')
 
             http.request(request) do |response|
-              response.read_body do |chunk|
-                file.write chunk
+              case response
+              when Net::HTTPSuccess then
+                response.read_body do |chunk|
+                  file.write chunk
+                end
+              when Net::HTTPRedirection then
+                raise("Too many HTTP redirects when downloading #{uri}") if limit <= 0
+
+                fetch(path, response['location'], limit - 1)
+                # prevent multiple writes to the cache
+                write_cache = false
+              else
+                response.error!
               end
             end
           end
@@ -151,8 +162,11 @@ module ForemanBootdisk
 
       return unless write_cache
 
+      contents = File.read(path)
+      return if contents.empty?
+
       ForemanBootdisk.logger.debug("Caching contents of #{uri}")
-      Rails.cache.write(uri, File.read(path), raw: true)
+      Rails.cache.write(uri, contents, raw: true)
     end
 
     # isolinux supports up to ISO 9660 level 2 filenames

data/app/services/foreman_bootdisk/renderer.rb

@@ -8,12 +8,13 @@ module ForemanBootdisk
       host = if subnet.present?
                # rendering a subnet-level bootdisk requires tricking the renderer into thinking it has a
                # valid host, without a token, but with a tftp proxy
-               Struct.new(:token, :provision_interface).new(
+               Struct.new(:token, :provision_interface, :content_source).new(
                  nil,
-                 Struct.new(:subnet).new(subnet)
+                 Struct.new(:subnet).new(subnet),
+                 nil
                )
              else
-               Struct.new(:token, :subnet).new(nil, nil)
+               Struct.new(:token, :subnet, :content_source).new(nil, nil, nil)
              end
 
       render_template(template: generic_host_template, host: host)

data/app/views/foreman_bootdisk/host.erb

@@ -35,10 +35,12 @@ set netX/gateway <%= interface.subnet.gateway %>
 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
+<% dns = interface.subnet.dns_servers.first -%>
+<% if dns.present? -%>
+echo Using DNS <%= dns %>
+set dns <%= dns %>
 set domain <%= interface.domain.to_s %>
 <% 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 '>= 1.22'
 
         security_block :bootdisk do |_map|
           permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host subnet help],

data/lib/foreman_bootdisk/version.rb

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

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 14.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-20 00:09+0000\n"
+"PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
@@ -115,7 +116,7 @@ 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 ""
@@ -139,7 +140,7 @@ 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"
@@ -162,12 +163,6 @@ 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 +190,11 @@ 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 PXELinux template: %s"
+msgstr ""
+
+msgid "Unable to generate disk template, PXELinux template not found."
+msgstr ""
 
 msgid "Upload ISO image to datastore for %s"
 msgstr ""
@@ -205,7 +203,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,14 +5,17 @@
 # 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
+# abf90805572190d649c59f7a021d76cb, 2014
+# simon11 <simon.stieger.98@live.de>, 2014
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_bootdisk 14.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-20 00:09+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2019-04-18 20:22+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,10 +42,10 @@ 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"
@@ -60,16 +63,16 @@ msgid "Download subnet generic image"
 msgstr "Generisches Abbild von Subnetz herunterladen"
 
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
-msgstr ""
+msgstr "Fehler beim Einhängen des ISO-Abbild am CDROM-Laufwerk für Instanz %{name}: %{message}"
 
 msgid "Failed to generate ISO image for instance %{name}: %{message}"
-msgstr ""
+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"
@@ -129,7 +132,7 @@ msgid "ISOLINUX directory"
 msgstr "ISOLINUX-Verzeichnis"
 
 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."
@@ -141,7 +144,7 @@ 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,10 +153,10 @@ 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."
@@ -164,12 +167,6 @@ 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 +194,11 @@ 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 PXELinux template: %s"
+msgstr ""
+
+msgid "Unable to generate disk template, PXELinux template not found."
+msgstr ""
 
 msgid "Upload ISO image to datastore for %s"
 msgstr "ISO-Abbild zum Datenspeicher für %s hochladen"

data/locale/en/foreman_bootdisk.po

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 6.0.0\n"
+"Project-Id-Version: foreman_bootdisk 14.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"
@@ -159,12 +159,6 @@ msgstr ""
 msgid "Subnet '%s' generic image"
 msgstr ""
 
-msgid "Subnet (%s) has no gateway defined"
-msgstr ""
-
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr ""
-
 msgid "Subnet boot disks"
 msgstr ""
 
@@ -192,7 +186,10 @@ msgstr ""
 msgid "Unable to find template specified by %s setting"
 msgstr ""
 
-msgid "Unable to generate disk template: %s"
+msgid "Unable to generate disk PXELinux template: %s"
+msgstr ""
+
+msgid "Unable to generate disk template, PXELinux template not found."
 msgstr ""
 
 msgid "Upload ISO image to datastore for %s"

data/locale/en_GB/foreman_bootdisk.po

@@ -8,10 +8,10 @@
 # Dominic Cleal <dominic@cleal.org>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_bootdisk 14.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-10-12 21:14+0000\n"
-"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"PO-Revision-Date: 2019-04-18 20:22+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/foreman/fore"
 "man/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "Boot disk based"
 msgstr "Boot disk based"
 
 msgid "Boot disk download not available for %s architecture"
-msgstr ""
+msgstr "Boot disk download not available for %s architecture"
 
 msgid "Boot disk embedded template"
 msgstr "Boot disk embedded template"
@@ -164,12 +164,6 @@ msgstr "SYSLINUX directory"
 msgid "Subnet '%s' generic image"
 msgstr "Subnet '%s' generic image"
 
-msgid "Subnet (%s) has no gateway defined"
-msgstr "Subnet (%s) has no gateway defined"
-
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr "Subnet (%s) has no primary DNS server defined"
-
 msgid "Subnet boot disks"
 msgstr "Subnet boot disks"
 
@@ -197,8 +191,11 @@ msgstr "True for full, false for basic reusable image"
 msgid "Unable to find template specified by %s setting"
 msgstr "Unable to find template specified by %s setting"
 
-msgid "Unable to generate disk template: %s"
-msgstr "Unable to generate disk template: %s"
+msgid "Unable to generate disk PXELinux template: %s"
+msgstr ""
+
+msgid "Unable to generate disk template, PXELinux template not found."
+msgstr ""
 
 msgid "Upload ISO image to datastore for %s"
 msgstr "Upload ISO image to datastore for %s"

data/locale/es/foreman_bootdisk.po

@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the foreman_bootdisk package.
 #
 # Translators:
-# Sergio Ocón <sergio.ocon@redhat.com>, 2015
+# Sergio Ocón <sergio.ocon@redhat.com>, 2014-2015
 # Sergio Ocón <sergio.ocon@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_bootdisk 14.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-20 00:09+0000\n"
+"PO-Revision-Date: 2019-04-18 20:22+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Spanish (http://www.transifex.com/foreman/foreman/language/es/)"
 "\n"
@@ -26,7 +26,7 @@ msgid "All images are usable as either ISOs or as disk images, including being w
 msgstr "Todas las imágenes pueden utilizarse como ISO o como imágenes de disco, incluso tras copiarlas en un disco USB con `dd`"
 
 msgid "Attach ISO image to CDROM drive for %s"
-msgstr ""
+msgstr "Adjuntar imagen ISO a la unidad CDROM para %s"
 
 msgid "Back"
 msgstr "Atrás"
@@ -35,13 +35,13 @@ msgid "Boot disk"
 msgstr "Disco de arranque"
 
 msgid "Boot disk based"
-msgstr ""
+msgstr "Basado en el disco de arranque"
 
 msgid "Boot disk download not available for %s architecture"
-msgstr ""
+msgstr "Descarga de disco de arranque no disponible para la arquitectura %s"
 
 msgid "Boot disk embedded template"
-msgstr ""
+msgstr "Plantilla inserta en el disco de arranque"
 
 msgid "Boot disks"
 msgstr "Discos de arranque"
@@ -59,16 +59,16 @@ msgid "Download subnet generic image"
 msgstr "Descargar imagen genérica de la subred"
 
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
-msgstr ""
+msgstr "Ocurrió un error al adjuntar la imagen ISP a la unidad CDROM de la instancia %{name}: %{message}"
 
 msgid "Failed to generate ISO image for instance %{name}: %{message}"
-msgstr ""
+msgstr "Ocurrió un error al generar la imagen ISP para la instancia %{name}: %{message}"
 
 msgid "Failed to render boot disk template"
 msgstr "No se pudo reproducir la plantilla del disco de arranque."
 
 msgid "Failed to upload ISO image for instance %{name}: %{message}"
-msgstr ""
+msgstr "Ocurrió un error al subir la imagen ISP para la instancia %{name}: %{message}"
 
 msgid "Full host '%s' image"
 msgstr "Imagen completa de host '%s'"
@@ -77,13 +77,13 @@ msgid "Full host image"
 msgstr "Imagen completa de host"
 
 msgid "Generating ISO image for %s"
-msgstr ""
+msgstr "Generando imagen para %s"
 
 msgid "Generic image"
 msgstr "Imagen genérica"
 
 msgid "Generic image template"
-msgstr ""
+msgstr "Plantilla de imagen genérica"
 
 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 "Las imágenes genéricas son imágenes de disco reutilizables que funcionan con cualquier host registrado en Foreman. Requiere un servicio básico DCHP y DNS para funcionar y comunicarse con el servidor, pero no necesita reservas DHCP o direcciones IP estáticas."
@@ -110,7 +110,7 @@ msgid "Host image"
 msgstr "Imágen de host"
 
 msgid "Host image template"
-msgstr ""
+msgstr "Plantilla de imagen de host"
 
 msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr "El host no está en modo build, así que no se puede producir la plantilla"
@@ -119,16 +119,16 @@ msgid "ISO build failed"
 msgstr "Error en la construcción del ISO"
 
 msgid "ISO generation command"
-msgstr ""
+msgstr "Comando de generación ISO"
 
 msgid "ISO hybrid conversion failed"
 msgstr "Error en la conversión del ISO Híbrido"
 
 msgid "ISOLINUX directory"
-msgstr ""
+msgstr "Directorio ISOLINUX"
 
 msgid "Installation media caching"
-msgstr ""
+msgstr "Habilitando caché de medios de instalación"
 
 msgid "Installation media files will be cached for full host images"
 msgstr "Archivos de medios de instalación se almacenarán en caché para imágenes completas de host"
@@ -140,7 +140,7 @@ msgid "Path to directory containing iPXE images"
 msgstr "Ruta al directorio que contiene las imágenes iPXE"
 
 msgid "Path to directory containing isolinux images"
-msgstr ""
+msgstr "Ruta al directorio que contiene imágenes isolinux"
 
 msgid "Path to directory containing syslinux images"
 msgstr "Ruta al directorio que contiene las imágenes syslinux"
@@ -149,26 +149,20 @@ msgid "Per-host images contain data about a particular host registered in Forema
 msgstr "Las imágenes por-host contienen datos sobre un host en particular registrado en Foreman y configuran una red completamente estática, sin necesidad de DHCP. Tras configurar la red, encadenan desde Foreman, cogiendo la configuración actual de SO y el estado de build del servidor."
 
 msgid "Please ensure the ipxe-bootimgs package is installed."
-msgstr ""
+msgstr "Asegúrese de que el paquete ipxe-bootimgs esté instalado."
 
 msgid "Please ensure the isolinux/syslinux package(s) are installed."
-msgstr ""
+msgstr "Asegúrese de que el(los) paquete(s) isolinux/syslinux estén instalados."
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin para Foreman que crea discos de arranque iPXE para provisionar hosts sin necesidad de infraestructura PXE"
 
 msgid "SYSLINUX directory"
-msgstr ""
+msgstr "Directorio SYSLINUX"
 
 msgid "Subnet '%s' generic image"
 msgstr "Imagen genérica '%s' de la subred"
 
-msgid "Subnet (%s) has no gateway defined"
-msgstr "La subred (%s) no tiene gateway definida"
-
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr "La subred (%s) no tiene servidor DNS primario definido"
-
 msgid "Subnet boot disks"
 msgstr "Discos de arranque de la subred"
 
@@ -196,17 +190,20 @@ msgstr "Verdadero para completo, falso para imagen básica reutilizable"
 msgid "Unable to find template specified by %s setting"
 msgstr "No ha sido posible encontrar la plantilla especificada por el parámetro de configuración %s"
 
-msgid "Unable to generate disk template: %s"
-msgstr "No se pudo generar la plantilla de disco: %s"
+msgid "Unable to generate disk PXELinux template: %s"
+msgstr ""
 
-msgid "Upload ISO image to datastore for %s"
+msgid "Unable to generate disk template, PXELinux template not found."
 msgstr ""
 
+msgid "Upload ISO image to datastore for %s"
+msgstr "Subir imagen ISP al almacén de datos para %s"
+
 msgid "Various types of boot disks can be created to provision hosts without the need for PXE services.  Boot disks can be attached to the host (physical or virtual) which boots from the disk, contacts Foreman and begins the OS installation."
 msgstr "Se puede crear varios tipos de discos de arranque para provisionar hosts sin necesidad de servicios PXE. Los discos de arranque pueden engancharse al host (físico o virtual) que arranca desde el disco, se conecta a Foreman y comienza la instalación del SO."
 
 msgid "iPXE directory"
-msgstr ""
+msgstr "Directorio iPXE"
 
 msgid "iPXE template to use for generic host boot disks"
 msgstr "Plantilla iPXE para usar en discos de arranque de host genéricos"