foreman_bootdisk 6.1.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a61c973be01e36e750806d001adeb4787dd22c
-  data.tar.gz: 759b57674e0090025cbbf30bbae4b31a3ff9a994
+  metadata.gz: c4cae342fdce305a1ef37aa490220f5f688696ba
+  data.tar.gz: 95527d0b5e50214b9a4f5e29c2e1fd8b68cdf5ea
 SHA512:
-  metadata.gz: 0e1f1a9790e67338e9e846f075da4ad20da44c8d659c15a973712d5f020c3f40fe40225593339c2b704bec1c956179eb316039b11e462433ed449eef3d649054
-  data.tar.gz: 76bcadb8a821cd544a2d912058e6c72e920134b01f5e216cb1ed6a638ed08a14e6e85413d622302b9f41aede0e18bedfbf42462cdaeef43011707d1cda7e9656
+  metadata.gz: 7c68354a0657bfa35aac430090ffa22a4be8bd6b847eb293628e6f5abcf9303df840dfb118228bb2312d7494f3903c5f1181872aff3beefd77ed466c525095ab
+  data.tar.gz: a3bd89f2fcd364027362562446d1b17b058d7ebd3d8bd7be32ebcc8c9976fdc2be3c07672258e7008c373e21903621e4dc13e25a82c03cdbd361f75cc2972d36

data/.tx/config

@@ -2,7 +2,7 @@
 host = https://www.transifex.com
 
 [foreman.bootdisk]
-file_filter = locale/<lang>/foreman_bootdisk.po
+file_filter = locale/<lang>/foreman_bootdisk.edit.po
 source_file = locale/foreman_bootdisk.pot
 source_lang = en
 type = PO

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v7.0.0
+* add automated "bootdisk" provisioning method when creating hosts on VMware
+  compute resources, attaching a host ISO image to the virtual CDROM (#3287)
+* fix RPM installation instructions
+* fix gettext compatibility with Foreman 1.11
+
 ## v6.1.0
 * add subnet-level generic image relying on template smart proxy (#8146)
 * add Catalan translation

data/README.md

@@ -18,7 +18,7 @@ Please see the Foreman manual for appropriate instructions:
 The gem name is "foreman_bootdisk".  Run `foreman-rake db:migrate`,
 `foreman-rake db:seed` after installation.
 
-RPM users can install the "ruby193-rubygem-foreman_bootdisk" or
+RPM users can install the "tfm-rubygem-foreman_bootdisk" or
 "rubygem-foreman_bootdisk" packages.
 
 Debian users can install the "ruby-foreman-bootdisk" package.
@@ -41,13 +41,14 @@ gPXE images are unsupported due to lack of initrd support.
 | >= 1.7          | ~> 4.0         |
 | >= 1.8          | ~> 5.0         |
 | >= 1.9          | ~> 6.0         |
+| >= 1.11         | >= 6.1, < 8.0  |
 
 # Usage
 
 ## Configuration
 
 With all image types, hosts have to be registered to Foreman prior to booting
-the image.  Hosts will be identified by their MAC or IP address to provide
+the image by hand. Hosts will be identified by their MAC or IP address to provide
 the correct provisioning template if the host is in build mode.
 
 For per-host images, ensure host IP addresses and subnets are populated, and
@@ -57,6 +58,14 @@ under Infrastructure>Subnets in Foreman.
 To permit access to images for non-admin users, add the "Boot disk access" role
 to a user or the "download_bootdisk" permission to an existing role.
 
+## Fully Automated Provisioning
+
+On VMWare compute resources it is possible to create a new host with a cd-drive
+preconfigured and have a per-host image attached before first boot. This allows
+a fully automated provisioning of hosts via ISO boot. This feature can be used by
+selecting the Bootdisk Based provisioning method under the OS tab when creating
+the host, or by setting provision_method: "bootdisk" using the API.
+
 ## Templates
 
 An OS iPXE provisioning template is required, see the list below for the name.

data/app/assets/javascripts/foreman_bootdisk/host_edit.js

@@ -0,0 +1,7 @@
+function bootdisk_provision_method_selected() {
+  $('div[id*=_provisioning]').hide();
+  $('#network_provisioning').show();
+  $('#bootdisk_provisioning').show();
+  $('#image_selection select').attr('disabled', true);
+}
+$(document).on('change', '#host_provision_method_bootdisk', bootdisk_provision_method_selected);

data/app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb

@@ -0,0 +1,55 @@
+module ForemanBootdisk
+  module ComputeResources
+    module Vmware
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :capabilities, :bootdisk
+        alias_method_chain :parse_args, :bootdisk
+      end
+
+      def capabilities_with_bootdisk
+        capabilities_without_bootdisk + [:bootdisk]
+      end
+
+      def new_cdrom(attr = {})
+        client.cdroms.new attr
+      end
+
+      def parse_args_with_bootdisk(args = {})
+        args = parse_args_without_bootdisk args
+        if args[:provision_method] == 'bootdisk'
+          args[:cdroms] = [new_cdrom]
+          args[:boot_order] = ['cdrom', 'disk']
+        end
+        args
+      end
+
+      def bootdisk_datastore(vm_uuid)
+        find_vm_by_uuid(vm_uuid).volumes.first.datastore
+      end
+
+      def iso_upload(iso, vm_uuid)
+        options = {
+          'local_path' => iso,
+          'datacenter' => dc.name,
+          'datastore' => bootdisk_datastore(vm_uuid),
+          'upload_directory' => 'foreman_isos' # fog creates the directory if it does not exist
+        }
+        client.upload_iso options
+      end
+
+      def iso_attach(iso, vm_uuid)
+        options = {
+          'instance_uuid' => vm_uuid,
+          'iso' => "foreman_isos/#{iso}",
+          'datastore' => bootdisk_datastore(vm_uuid),
+          'start_connected' => false,
+          'connected' => true,
+          'allow_guest_control' => true
+        }
+        client.vm_reconfig_cdrom options
+      end
+    end
+  end
+end

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

@@ -1,7 +1,12 @@
 require 'uri'
 
 module ForemanBootdisk::HostExt
-  extend ActiveSupport::Concerns
+  extend ActiveSupport::Concern
+
+  included do
+    alias_method_chain :validate_media?, :bootdisk
+    alias_method_chain :can_be_built?, :bootdisk
+  end
 
   def bootdisk_template
     ProvisioningTemplate.find_by_name(Setting[:bootdisk_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_host_template'))
@@ -19,4 +24,20 @@ module ForemanBootdisk::HostExt
   def bootdisk_raise(*args)
     raise ::Foreman::Exception.new(*args)
   end
+
+  def bootdisk_build?
+    provision_method == 'bootdisk'
+  end
+
+  def bootdisk?
+    managed? && bootdisk_build? && SETTINGS[:unattended]
+  end
+
+  def validate_media_with_bootdisk?
+    validate_media_without_bootdisk? || (managed && bootdisk_build? && build?)
+  end
+
+  def can_be_built_with_bootdisk?
+    can_be_built_without_bootdisk? || (managed? and SETTINGS[:unattended] and bootdisk_build? and !build?)
+  end
 end

data/app/models/concerns/foreman_bootdisk/orchestration/compute.rb

@@ -0,0 +1,86 @@
+require 'tmpdir'
+
+module ForemanBootdisk
+  module Orchestration
+    module Compute
+      extend ActiveSupport::Concern
+
+      included do
+        after_validation :queue_bootdisk_compute
+        after_build :rebuild_with_bootdisk
+      end
+
+      def bootdisk_isodir
+        @bootdisk_isodir ||= Dir.mktmpdir
+      end
+
+      def bootdisk_isofile
+        File.join(bootdisk_isodir, "#{name}.iso")
+      end
+
+      def queue_bootdisk_compute
+        return unless compute? && errors.empty? && new_record?
+        return unless provision_method == 'bootdisk'
+        queue.create(name: _('Generating ISO image for %s') % self, priority: 5,
+                     action: [self, :setGenerateIsoImage])
+        queue.create(name: _('Upload ISO image to datastore for %s') % self, priority: 6,
+                     action: [self, :setIsoImage])
+        queue.create(name: _('Attach ISO image to CDROM drive for %s') % self, priority: 1001,
+                     action: [self, :setAttachIsoImage])
+      end
+
+      def bootdisk_generate_iso_image
+        ForemanBootdisk::ISOGenerator.generate(ipxe: bootdisk_template_render, dir: Dir.tmpdir) do |image|
+          FileUtils.mv image, bootdisk_isofile
+        end
+      end
+
+      def bootdisk_upload_iso
+        compute_resource.iso_upload(bootdisk_isofile, uuid)
+      end
+
+      def bootdisk_attach_iso
+        compute_resource.iso_attach(File.basename(bootdisk_isofile), uuid)
+      end
+
+      def setGenerateIsoImage
+        logger.info 'Generating ISO image for %s' % name
+        bootdisk_generate_iso_image
+      rescue => e
+        failure _('Failed to generate ISO image for instance %{name}: %{message}') % { name: name, message: e.message }, e
+      end
+
+      def delGenerateIsoImage; end
+
+      def setIsoImage
+        logger.info "Uploading ISO image #{bootdisk_isofile} for #{name}"
+        bootdisk_upload_iso
+      rescue => e
+        failure _('Failed to upload ISO image for instance %{name}: %{message}') % { name: name, message: e.message }, e
+      end
+
+      def delIsoImage; end
+
+      def setAttachIsoImage
+        logger.info 'Attaching ISO image to CDROM drive for %s' % name
+        bootdisk_attach_iso
+      rescue => e
+        failure _('Failed to attach ISO image to CDROM drive of instance %{name}: %{message}') % { name: name, message: e.message }, e
+      end
+
+      def delAttachIsoImage; end
+
+      def rebuild_with_bootdisk
+        return true unless bootdisk?
+        begin
+          bootdisk_generate_iso_image
+          bootdisk_upload_iso
+          bootdisk_attach_iso
+        rescue => e
+          Foreman::Logging.exception "Failed to rebuild Bootdisk image for #{name}", e, :level => :error
+          return false
+        end
+      end
+    end
+  end
+end

data/app/views/hosts/provision_method/bootdisk/_form.html.erb

@@ -0,0 +1,4 @@
+<%= javascript 'foreman_bootdisk/host_edit' %>
+<div id='bootdisk_provisioning' <%= display? !@host.bootdisk_build? %> >
+
+</div>

data/lib/foreman_bootdisk/engine.rb

@@ -28,9 +28,27 @@ module ForemanBootdisk
       Apipie.configuration.checksum_path += ['/bootdisk/api/']
     end
 
-    initializer 'foreman_bootdisk.register_plugin', :after=> :finisher_hook do |app|
+    # Precompile any JS or CSS files under app/assets/
+    # If requiring files from each other, list them explicitly here to avoid precompiling the same
+    # content twice.
+    assets_to_precompile =
+      Dir.chdir(root) do
+        Dir['app/assets/javascripts/**/*', 'app/assets/stylesheets/**/*'].map do |f|
+          f.split(File::SEPARATOR, 4).last
+        end
+      end
+
+    initializer 'foreman_bootdisk.assets.precompile' do |app|
+      app.config.assets.precompile += assets_to_precompile
+    end
+
+    initializer 'foreman_bootdisk.configure_assets', group: :assets do
+      SETTINGS[:foreman_bootdisk] = { assets: { precompile: assets_to_precompile } }
+    end
+
+    initializer 'foreman_bootdisk.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.9'
+        requires_foreman '>= 1.11'
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :subnet, :help],
@@ -41,6 +59,7 @@ module ForemanBootdisk
 
         allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
         apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
+        provision_method 'bootdisk', N_('Bootdisk Based')
       end
     end
 
@@ -53,8 +72,10 @@ module ForemanBootdisk
     config.to_prepare do
       begin
         Host::Managed.send(:include, ForemanBootdisk::HostExt)
+        Host::Managed.send(:include, ForemanBootdisk::Orchestration::Compute) if SETTINGS[:unattended]
         HostsHelper.send(:include, ForemanBootdisk::HostsHelperExt)
         UnattendedController.send(:include, ForemanBootdisk::UnattendedControllerExt)
+        Foreman::Model::Vmware.send(:include, ForemanBootdisk::ComputeResources::Vmware) if SETTINGS[:vmware]
       rescue => e
         puts "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"
       end

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '6.1.0'
+  VERSION = '7.0.0'
 end

data/locale/Makefile

@@ -10,9 +10,10 @@ DOMAIN = foreman_bootdisk
 VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
 POTFILE = $(DOMAIN).pot
 MOFILE = $(DOMAIN).mo
-POFILES = $(shell find . -name '*.po')
+POFILES = $(shell find . -name '$(DOMAIN).po')
 MOFILES = $(patsubst %.po,%.mo,$(POFILES))
 POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
 
 %.mo: %.po
 	mkdir -p $(shell dirname $@)/LC_MESSAGES
@@ -29,14 +30,10 @@ all-mo: $(MOFILES)
 	cat $@
 	! grep -q msgid $@
 
-check: $(POXFILES)
-	msgfmt -c ${POTFILE}
+%.edit.po:
+	touch $@
 
-# Merge PO files
-update-po:
-	for f in $(shell find ./ -name "*.po") ; do \
-		msgmerge -N --backup=none -U $$f ${POTFILE} ; \
-	done
+check: $(POXFILES)
 
 # Unify duplicate translations
 uniq-po:
@@ -44,19 +41,20 @@ uniq-po:
 		msguniq $$f -o $$f ; \
 	done
 
-tx-pull:
+tx-pull: $(EDITFILES)
 	tx pull -f
-	for f in $(POFILES) ; do \
+	for f in $(EDITFILES) ; do \
 		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
 	done
-	-git commit -a -m "i18n - pulling from tx"
-
-reset-po:
-	# merging po files is unnecessary when using transifex.com
-	git checkout -- ../locale/*/*po
 
-tx-update: tx-pull reset-po $(MOFILES)
-	# amend mo files
-	git add ../locale/*/LC_MESSAGES
-	git commit -a --amend -m "i18n - pulling from tx"
-	-echo Changes commited!
+tx-update: tx-pull
+	@echo
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
+	@echo
+
+mo-files: $(MOFILES)
+	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	git commit -m "i18n - pulling from tx"
+	@echo
+	@echo Changes commited!
+	@echo

data/locale/ca/foreman_bootdisk.po

@@ -1,33 +1,30 @@
-# foreman_bootdisk
-# 
-# This file is distributed under the same license as foreman_bootdisk.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_bootdisk package.
+#
 # Translators:
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 6.0.0\n"
+"Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-20 11:19+0000\n"
-"PO-Revision-Date: 2015-12-10 08:15+0000\n"
-"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
-"Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\n"
+"PO-Revision-Date: 2016-03-24 09:54+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
+"Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
+"\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-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 templates."
-msgstr "Una variant de la imatge per amfitrió que conté el gestor d'arrencada del SO incrustat a l'interior del disc. Això pot ser útil si falla la cadena d'arrencada en algun maquinari, però té l'inconvenient que la imatge ha de ser regenerada en qualsevol canvi realitzat al sistema operatiu, al gestor d'arrencada o a les plantilles."
+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 ""
-"All images are usable as either ISOs or as disk images, including being "
-"written to a USB disk with `dd`."
+msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
+msgstr ""
+
+msgid "Attach ISO image to CDROM drive for %s"
 msgstr ""
 
 msgid "Back"
@@ -39,13 +36,11 @@ msgstr "Disc d'arrencada"
 msgid "Boot disks"
 msgstr "Discs d'arrencada"
 
-msgid ""
-"Bootdisk is not supported with safemode rendering, please disable "
-"safemode_render under Adminster>Settings"
+msgid "Bootdisk Based"
 msgstr ""
 
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
-msgstr ""
+msgstr "L'ordre per generar la imatge ISO, utilitzeu genisoimage o mkisofs"
 
 msgid "Download generic image"
 msgstr "Baixa la imatge genèrica"
@@ -53,23 +48,34 @@ msgstr "Baixa la imatge genèrica"
 msgid "Download host image"
 msgstr "Baixa la imatge d'amfitrió"
 
-msgid "Failed to render boot disk template: %s"
+msgid "Download subnet generic image"
+msgstr "Baixa la imatge genèrica de subxarxa"
+
+msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
+msgstr ""
+
+msgid "Failed to generate ISO image for instance %{name}: %{message}"
+msgstr ""
+
+msgid "Failed to render boot disk template"
+msgstr ""
+
+msgid "Failed to upload ISO image for instance %{name}: %{message}"
 msgstr ""
 
 msgid "Full host '%s' image"
 msgstr ""
 
 msgid "Full host image"
+msgstr "Imatge completa d'amfitrió"
+
+msgid "Generating ISO image for %s"
 msgstr ""
 
 msgid "Generic image"
 msgstr "Imatge 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."
+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"
@@ -79,16 +85,16 @@ msgid "Host '%s' image"
 msgstr ""
 
 msgid "Host has no IP address defined"
-msgstr ""
+msgstr "L'amfitrió no té definida cap adreça IP"
 
 msgid "Host has no domain defined"
-msgstr ""
+msgstr "L'amfitrió no té definit cap domini"
 
 msgid "Host has no provisioning interface defined"
-msgstr ""
+msgstr "L'amfitrió no té definida cap interfície d'aprovisionament"
 
 msgid "Host has no subnet defined"
-msgstr ""
+msgstr "L'amfitrió no té definida cap subxarxa"
 
 msgid "Host image"
 msgstr "Imatge d'amfitrió"
@@ -97,7 +103,7 @@ msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr ""
 
 msgid "ISO build failed"
-msgstr ""
+msgstr "No s'ha pogut construir la ISO"
 
 msgid "ISO hybrid conversion failed"
 msgstr ""
@@ -105,59 +111,67 @@ 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 ""
-"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."
+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 iPXE images"
-msgstr ""
+msgstr "El camí al directori que conté les imatges iPXE"
 
 msgid "Path to directory containing syslinux images"
-msgstr ""
+msgstr "El camí al directori que conté les imatges syslinux"
 
-msgid ""
-"Per-host images contain data about a particular host registered in Foreman "
-"and set up fully static networking, avoiding the requirement for DHCP.  "
-"After networking is configured, they chainload from Foreman, picking up the "
-"current OS configuration and build state from the server."
+msgid "Per-host images contain data about a particular host registered in Foreman and set up fully static networking, avoiding the requirement for DHCP.  After networking is configured, they chainload from Foreman, picking up the current OS configuration and build state from the server."
 msgstr ""
 
 msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Si us plau, assegureu-vos que estiguin instal·lats els paquets ipxe-bootimgs i syslinux."
+
+msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr ""
 
-msgid ""
-"Plugin for Foreman that creates iPXE-based boot disks to provision hosts "
-"without the need for PXE infrastructure."
+msgid "Subnet '%s' generic image"
 msgstr ""
 
 msgid "Subnet (%s) has no gateway defined"
-msgstr ""
+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"
+
+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 ""
-"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."
+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 "This image is generic for all hosts with a provisioning NIC on that subnet."
 msgstr ""
 
 msgid "True for full, false for basic reusable image"
 msgstr ""
 
 msgid "Unable to find template specified by %s setting"
-msgstr ""
+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 "Upload ISO image to datastore for %s"
 msgstr ""
 
-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."
+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 ""
 
 msgid "iPXE template to use for generic host boot disks"