foreman_bootdisk 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc62297d4d1bc9080a8e9aebe25d02eb185ab357
-  data.tar.gz: f09c9610aae17af4185be4577f671ac4546ad669
+  metadata.gz: 4ecc018ff9fc843eed00c29113ffacd3b5f41748
+  data.tar.gz: 1b66b121c941e1920c209fa8150dfaf7bb352473
 SHA512:
-  metadata.gz: 61fa71708a3cdd5ee6152197c4cbd8a13011c4c733c821a453e6d9320677463820c624f57224c65d3ec43cd258167ac68cb8bda3829d0d0093fea3fc527bbbd0
-  data.tar.gz: a8415772ff0aa0ead2e4e5cb6baead0931c315ab131203cb7917df33e290c60fd0f9eaedfd4f93d9a3254ebe7007bf4a923e26fd150e2e5c539da855f15aac8a
+  metadata.gz: 35e336d9aedce269030d034096488dbca617a07f3ef69e4525b70a1bfd86881e50d5c7d8a81f01b72295aee440feaab06c7c51e00446b15c0bd39fa5cf7ffedc
+  data.tar.gz: ef28b6dab07c4a17838a41818bc8e2fde706ffb0c0e63022790760aa9349fcc7cf7ef35ae3af7adfa6b6df9f5354b198fbfabcea5a29af214d7b7ea02c757c4b

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v8.0.1
+* translate setting names
+* use dropdown menus for template settings (#14948)
+* associate orgs and locs to seeded templates (#14682)
+* use Foreman 1.12 CDROM helper (#15173)
+
 ## v8.0.0
 * fix button and compute resource loading compatibility with Foreman 1.12
 

data/README.md

@@ -270,8 +270,10 @@ The templates used on the boot disks themselves are read-only so they can be
 updated in new versions of the plugin.  To customise, copy the contents to a
 new template and set the name in Administer>Settings>Bootdisk.
 
-* `bootdisk_host_template` is the name of the per-host boot disk template
-* `bootdisk_generic_host_template` is the name of the generic boot disk template
+* _Host image template_ (`bootdisk_host_template`) is the name of the per-host
+  boot disk template
+* _Generic image template_ (`bootdisk_generic_host_template`) is the name of
+  the generic boot disk template
 
 These templates are baked into the downloaded ISO files and generally don't
 need to be modified.
@@ -284,11 +286,14 @@ with no intermediate template or bootloader.
 Some more advanced settings are available under Administer>Settings>Bootdisk in
 the Foreman UI.
 
-* `bootdisk_ipxe_dir` points to the directory containing ipxe.lkrn
-* `bootdisk_syslinux_dir` points to the directory containing syslinux images
-* `bootdisk_mkiso_command` is the name of genisoimage/mkisofs on your OS
-* `bootdisk_cache_media` controls whether to cache OS boot files from
-  installation media for full host images
+* _Installation media caching_ (`bootdisk_cache_media`) controls whether to
+  cache OS boot files from installation media for full host images
+* _iPXE directory_ (`bootdisk_ipxe_dir`) points to the directory containing
+  ipxe.lkrn
+* _ISO generation command_ (`bootdisk_mkiso_command`) is the name of
+  genisoimage/mkisofs on your OS
+* _SYSLINUX directory_ (`bootdisk_syslinux_dir`) points to the directory
+  containing syslinux images
 
 ### RBAC
 

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

@@ -5,3 +5,9 @@ function bootdisk_provision_method_selected() {
   $('#image_selection select').attr('disabled', true);
 }
 $(document).on('change', '#host_provision_method_bootdisk', bootdisk_provision_method_selected);
+
+$(document).on('ContentLoad', function() {
+  if($('#host_provision_method_bootdisk').is(':checked')) {
+    bootdisk_provision_method_selected();
+  }
+});

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

@@ -12,10 +12,6 @@ module ForemanBootdisk
         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'

data/app/models/setting/bootdisk.rb

@@ -5,15 +5,16 @@ class Setting::Bootdisk< ::Setting
 
     ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
     syslinux = ['/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
       [
-        self.set('bootdisk_ipxe_dir', N_('Path to directory containing iPXE images'), ipxe),
-        self.set('bootdisk_syslinux_dir', N_('Path to directory containing syslinux images'), syslinux),
-        self.set('bootdisk_host_template', N_('iPXE template to use for host-specific boot disks'), 'Boot disk iPXE - host'),
-        self.set('bootdisk_generic_host_template', N_('iPXE template to use for generic host boot disks'), 'Boot disk iPXE - generic host'),
-        self.set('bootdisk_mkiso_command', N_('Command to generate ISO image, use genisoimage or mkisofs'), 'genisoimage'),
-        self.set('bootdisk_cache_media', N_('Installation media files will be cached for full host images'), true),
+        self.set('bootdisk_ipxe_dir', N_('Path to directory containing iPXE images'), ipxe, N_('iPXE directory')),
+        self.set('bootdisk_syslinux_dir', N_('Path to directory containing syslinux images'), syslinux, N_('SYSLINUX directory')),
+        self.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),
+        self.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),
+        self.set('bootdisk_mkiso_command', N_('Command to generate ISO image, use genisoimage or mkisofs'), 'genisoimage', N_('ISO generation command')),
+        self.set('bootdisk_cache_media', N_('Installation media files will be cached for full host images'), true, N_('Installation media caching')),
       ].compact.each { |s| self.create s.update(:category => "Setting::Bootdisk") }
     end
 

data/app/views/foreman_bootdisk/generic_host.erb

@@ -9,6 +9,8 @@
 #
 # Copy this template to customize it, the original is read-only.
 
+echo Foreman Bootdisk: Generic image
+
 # loop over net* until we can get a template
 <% url = bootdisk_chain_url %>
 <% (0..32).each do |i| -%>

data/app/views/foreman_bootdisk/host.erb

@@ -14,26 +14,29 @@ bootdisk_raise(N_('Subnet (%s) has no gateway defined'), interface.subnet) if in
 bootdisk_raise(N_('Subnet (%s) has no primary DNS server defined'), interface.subnet) if interface.subnet.dns_primary.nil? || interface.subnet.dns_primary.empty?
 %>
 
+echo Foreman Bootdisk: Host image (<%= @host.name %>)
+
 # loop over net* until the host's MAC matches
 <% (0..32).each do |i| -%>
 :net<%= i %>
 isset ${net<%= i -%>/mac} || goto no_nic
 echo net<%= i -%> is a ${net<%= i -%>/chip} with MAC ${net<%= i -%>/mac}
 iseq ${net<%= i -%>/mac} <%= interface.mac -%> || goto net<%= i+1 %>
-ifopen net<%= i %>
 set idx:int32 <%= i %>
 goto loop_success
 <% end -%>
 
 :loop_success
-echo Configuring net${idx} for static IP address
+echo Configuring net${idx} for static IP address <%= interface.ip %>
 ifopen net${idx}
 set netX/ip <%= interface.ip %>
 set netX/netmask <%= interface.subnet.mask %>
 set netX/gateway <%= interface.subnet.gateway %>
+ifstat net${idx}
 route
 
 # Note, iPXE can only use one DNS server
+echo Using DNS <%= interface.subnet.dns_primary %>
 set dns <%= interface.subnet.dns_primary %>
 set domain <%= interface.domain.to_s %>
 

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

@@ -1,7 +1,12 @@
 kind = TemplateKind.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.where(:name => 'Boot disk iPXE - host').first_or_create do |template|
     template.attributes = {
       :template_kind_id => kind.id,
@@ -18,6 +23,7 @@ ProvisioningTemplate.without_auditing do
   tmpl.save!(:validate => false) if tmpl.changes.present?
 
   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.where(:name => 'Boot disk iPXE - generic host').first_or_create do |template|
     template.attributes = {
       :template_kind_id => kind.id,
@@ -32,4 +38,9 @@ ProvisioningTemplate.without_auditing do
   }
   tmpl.locked = true
   tmpl.save!(:validate => false) if tmpl.changes.present?
+
+  ProvisioningTemplate.where(:name => created, :default => true).each do |tmpl|
+    tmpl.organizations = organizations if SETTINGS[:organizations_enabled]
+    tmpl.locations = locations if SETTINGS[:locations_enabled]
+  end
 end

data/lib/foreman_bootdisk/engine.rb

@@ -59,7 +59,8 @@ 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')
+        provision_method 'bootdisk', N_('Boot disk based')
+        template_labels 'Bootdisk' => N_('Boot disk embedded template')
       end
     end
 

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '8.0.0'
+  VERSION = '8.0.1'
 end

data/lib/tasks/bootdisk.rake

@@ -68,16 +68,13 @@ namespace :test do
     t.libs << ["test",test_dir]
     t.pattern = "#{test_dir}/**/*_test.rb"
     t.verbose = true
+    t.warning = false
   end
 end
 
-Rake::Task[:test].enhance do
-  Rake::Task['test:foreman_bootdisk'].invoke
-end
+Rake::Task[:test].enhance ['test:foreman_bootdisk']
 
 load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance do
-    Rake::Task['test:foreman_bootdisk'].invoke
-  end
+  Rake::Task["jenkins:unit"].enhance ['test:foreman_bootdisk']
 end

data/locale/ca/foreman_bootdisk.po

@@ -33,12 +33,15 @@ msgstr "Enrere"
 msgid "Boot disk"
 msgstr "Disc d'arrencada"
 
-msgid "Boot disks"
-msgstr "Discs d'arrencada"
+msgid "Boot disk based"
+msgstr ""
 
-msgid "Bootdisk Based"
+msgid "Boot disk embedded template"
 msgstr ""
 
+msgid "Boot disks"
+msgstr "Discs d'arrencada"
+
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "L'ordre per generar la imatge ISO, utilitzeu genisoimage o mkisofs"
 
@@ -75,6 +78,9 @@ msgstr ""
 msgid "Generic image"
 msgstr "Imatge genèrica"
 
+msgid "Generic image template"
+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 ""
 
@@ -99,15 +105,24 @@ msgstr "L'amfitrió no té definida cap subxarxa"
 msgid "Host image"
 msgstr "Imatge d'amfitrió"
 
+msgid "Host image template"
+msgstr ""
+
 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"
 
+msgid "ISO generation command"
+msgstr ""
+
 msgid "ISO hybrid conversion failed"
 msgstr ""
 
+msgid "Installation media caching"
+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"
 
@@ -129,6 +144,9 @@ msgstr "Si us plau, assegureu-vos que estiguin instal·lats els paquets ipxe-boo
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr ""
 
+msgid "SYSLINUX directory"
+msgstr ""
+
 msgid "Subnet '%s' generic image"
 msgstr ""
 
@@ -174,6 +192,9 @@ 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."
 msgstr ""
 
+msgid "iPXE directory"
+msgstr ""
+
 msgid "iPXE template to use for generic host boot disks"
 msgstr ""
 

data/locale/de/foreman_bootdisk.po

@@ -35,12 +35,15 @@ msgstr "Zurück"
 msgid "Boot disk"
 msgstr "Startmedium"
 
-msgid "Boot disks"
-msgstr "Startmedien"
+msgid "Boot disk based"
+msgstr ""
 
-msgid "Bootdisk Based"
+msgid "Boot disk embedded template"
 msgstr ""
 
+msgid "Boot disks"
+msgstr "Startmedien"
+
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "Kommando zur Erstellung von ISO-Abbildern, verwende genisoimage oder mkisofs"
 
@@ -77,6 +80,9 @@ msgstr ""
 msgid "Generic image"
 msgstr "Generisches Abbild"
 
+msgid "Generic image template"
+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 "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."
 
@@ -101,15 +107,24 @@ msgstr "Host hat kein Subnetz definiert"
 msgid "Host image"
 msgstr "Host-Abbild"
 
+msgid "Host image template"
+msgstr ""
+
 msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr "Host ist nicht im Buildmodus. Daher kann die Vorlage nicht erstellt werden."
 
 msgid "ISO build failed"
 msgstr "ISO-Erstellung fehlgeschlagen"
 
+msgid "ISO generation command"
+msgstr ""
+
 msgid "ISO hybrid conversion failed"
 msgstr "ISO hybrid Konvertierung fehlgeschlagen"
 
+msgid "Installation media caching"
+msgstr ""
+
 msgid "Installation media files will be cached for full host images"
 msgstr "Installationsmedien-Dateien werden für vollständige Host-Images zwischengespeichert."
 
@@ -131,6 +146,9 @@ msgstr "Bitte stellen Sie sicher, dass die Pakete ipxe-bootimgs und syslinux ins
 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 "SYSLINUX directory"
+msgstr ""
+
 msgid "Subnet '%s' generic image"
 msgstr "Subnetz '%s' generisches Abbild"
 
@@ -176,6 +194,9 @@ 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."
 msgstr "Verschiedene Arten von Startmedien können erstellt werden, um Hosts ohne die Notwendigkeit von PXE-Diensten bereitzustellen. Startmedien können mit dem Host (physisch oder virtuell) verbunden werden, der von der Festplatte bootet, Foreman kontaktiert und die OS-Installation beginnt."
 
+msgid "iPXE directory"
+msgstr ""
+
 msgid "iPXE template to use for generic host boot disks"
 msgstr "iPXE Vorlage zur Verwendung für generische Host-Startmedien"
 

data/locale/en/foreman_bootdisk.po

@@ -30,10 +30,13 @@ msgstr ""
 msgid "Boot disk"
 msgstr ""
 
-msgid "Boot disks"
+msgid "Boot disk based"
+msgstr ""
+
+msgid "Boot disk embedded template"
 msgstr ""
 
-msgid "Bootdisk Based"
+msgid "Boot disks"
 msgstr ""
 
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
@@ -72,6 +75,9 @@ msgstr ""
 msgid "Generic image"
 msgstr ""
 
+msgid "Generic image template"
+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 ""
 
@@ -96,15 +102,24 @@ msgstr ""
 msgid "Host image"
 msgstr ""
 
+msgid "Host image template"
+msgstr ""
+
 msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr ""
 
 msgid "ISO build failed"
 msgstr ""
 
+msgid "ISO generation command"
+msgstr ""
+
 msgid "ISO hybrid conversion failed"
 msgstr ""
 
+msgid "Installation media caching"
+msgstr ""
+
 msgid "Installation media files will be cached for full host images"
 msgstr ""
 
@@ -126,6 +141,9 @@ msgstr ""
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr ""
 
+msgid "SYSLINUX directory"
+msgstr ""
+
 msgid "Subnet '%s' generic image"
 msgstr ""
 
@@ -171,6 +189,9 @@ 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."
 msgstr ""
 
+msgid "iPXE directory"
+msgstr ""
+
 msgid "iPXE template to use for generic host boot disks"
 msgstr ""
 

data/locale/en_GB/foreman_bootdisk.po

@@ -35,12 +35,15 @@ msgstr "Back"
 msgid "Boot disk"
 msgstr "Boot disk"
 
+msgid "Boot disk based"
+msgstr ""
+
+msgid "Boot disk embedded template"
+msgstr ""
+
 msgid "Boot disks"
 msgstr "Boot disks"
 
-msgid "Bootdisk Based"
-msgstr "Bootdisk Based"
-
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "Command to generate ISO image, use genisoimage or mkisofs"
 
@@ -77,6 +80,9 @@ msgstr "Generating ISO image for %s"
 msgid "Generic image"
 msgstr "Generic image"
 
+msgid "Generic image template"
+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 "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."
 
@@ -101,15 +107,24 @@ msgstr "Host has no subnet defined"
 msgid "Host image"
 msgstr "Host image"
 
+msgid "Host image template"
+msgstr ""
+
 msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr "Host is not in build mode, so the template cannot be rendered"
 
 msgid "ISO build failed"
 msgstr "ISO build failed"
 
+msgid "ISO generation command"
+msgstr ""
+
 msgid "ISO hybrid conversion failed"
 msgstr "ISO hybrid conversion failed"
 
+msgid "Installation media caching"
+msgstr ""
+
 msgid "Installation media files will be cached for full host images"
 msgstr "Installation media files will be cached for full host images"
 
@@ -131,6 +146,9 @@ msgstr "Please ensure the ipxe-bootimgs and syslinux packages are installed."
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 
+msgid "SYSLINUX directory"
+msgstr ""
+
 msgid "Subnet '%s' generic image"
 msgstr "Subnet '%s' generic image"
 
@@ -176,6 +194,9 @@ msgstr "Upload ISO image to datastore for %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 "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 "iPXE directory"
+msgstr ""
+
 msgid "iPXE template to use for generic host boot disks"
 msgstr "iPXE template to use for generic host boot disks"