foreman_bootdisk 8.0.2 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e4edcf1bef7cac12fd6dfc3126c56d38dd40fcc
-  data.tar.gz: d567eaaf000f3de41b406d377e48309f84d00de1
+  metadata.gz: 082ac2b9dd317b3ccc8009b039eb390a932b36d1
+  data.tar.gz: 1e0c848ca45723620186429e46a2d9bf7d2a217f
 SHA512:
-  metadata.gz: 4261cb941f1a326bc0212fceb800a2791275e1cb48bf1c31a072be194b82272af998e43f459b9ba1e5a1d5c61fac1b7851d2f10b4cf11b95b86e96c3e8424fa3
-  data.tar.gz: 72f9f11d227df4e5e665e0e9f54b5b7a4fe409097d68c1654ff3b740fb445bfd5b1a9b44039ba82f422e69ab65ad850b5f9dc4052b38472370b680117db90c61
+  metadata.gz: 2778790684106e88c33f2838ab8d6d7fcefe225059c136855a21dbaf91a9d1a8e0dff7cff0ac3b41400c9de6284a839c0b5d84331b5ce7be9b161051062bb64b
+  data.tar.gz: 67651bcb8230af2f329a1e822af51fa93d63747082ce1785d7ce74da528d87f6cbbb31b76ae71e6785454368794d389c49c2a7529d2f6937a9fb9307995d2f4b

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v8.1.0
+* add separate ISOLINUX dir setting for Debian OSes (#14896)
+* add friendly setting category name for Foreman 1.14
+* change default API version to v2
+* fix missing subnet boot disk API permission
+
 ## v8.0.2
 * fix truncation of filenames with suffixes for ISO9660
 * replace deprecated pxe_render call for Foreman 1.14

data/app/models/setting/bootdisk.rb

@@ -4,12 +4,14 @@ class Setting::Bootdisk< ::Setting
     return unless super
 
     ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
-    syslinux = ['/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
+    isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
+    syslinux = ['/usr/lib/syslinux/modules/bios', '/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, N_('iPXE directory')),
+        self.set('bootdisk_isolinux_dir', N_('Path to directory containing isolinux images'), isolinux, N_('ISOLINUX 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),
@@ -21,4 +23,8 @@ class Setting::Bootdisk< ::Setting
     true
 
   end
+
+  def self.humanized_category
+    N_('Boot disk')
+  end
 end

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -42,10 +42,10 @@ class ForemanBootdisk::ISOGenerator
       Dir.mkdir(File.join(wd, 'build'))
 
       if opts[:isolinux]
-        unless File.exists?(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'))
-          raise ::Foreman::Exception.new(N_("Please ensure the ipxe-bootimgs and syslinux packages are installed."))
+        unless File.exists?(File.join(Setting[:bootdisk_isolinux_dir], 'isolinux.bin'))
+          raise ::Foreman::Exception.new(N_("Please ensure the isolinux/syslinux package(s) are installed."))
         end
-        FileUtils.cp(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'), File.join(wd, 'build', 'isolinux.bin'))
+        FileUtils.cp(File.join(Setting[:bootdisk_isolinux_dir], 'isolinux.bin'), File.join(wd, 'build', 'isolinux.bin'))
         if File.exist?(File.join(Setting[:bootdisk_syslinux_dir], 'ldlinux.c32'))
           FileUtils.cp(File.join(Setting[:bootdisk_syslinux_dir], 'ldlinux.c32'), File.join(wd, 'build', 'ldlinux.c32'))
         end
@@ -56,7 +56,7 @@ class ForemanBootdisk::ISOGenerator
 
       if opts[:ipxe]
         unless File.exists?(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn'))
-          raise ::Foreman::Exception.new(N_("Please ensure the ipxe-bootimgs and syslinux packages are installed."))
+          raise ::Foreman::Exception.new(N_("Please ensure the ipxe-bootimgs package is installed."))
         end
         FileUtils.cp(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn'), File.join(wd, 'build', 'ipxe'))
         File.open(File.join(wd, 'build', 'script'), 'w') { |file| file.write(opts[:ipxe]) }

data/config/routes.rb

@@ -10,7 +10,7 @@ ForemanBootdisk::Engine.routes.draw do
   end
 
   namespace :api, :defaults => {:format => 'json'} do
-    scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
+    scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       get 'generic', :to => 'disks#generic'
       constraints(:id => /[^\/]+/) do
         get 'hosts/:id', :to => 'disks#host'

data/lib/foreman_bootdisk/engine.rb

@@ -52,7 +52,8 @@ module ForemanBootdisk
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :subnet, :help],
-                                          :'foreman_bootdisk/api/v2/disks' => [:generic, :host]}
+                                          :'foreman_bootdisk/api/v2/disks' => [:generic, :host],
+                                          :'foreman_bootdisk/api/v2/subnet_disks' => [:subnet]}
         end
 
         role "Boot disk access", [:download_bootdisk]

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '8.0.2'
+  VERSION = '8.1.0'
 end

data/lib/tasks/bootdisk.rake

@@ -1,4 +1,5 @@
 require 'date'
+require 'rake/testtask'
 require 'tmpdir'
 
 namespace :bootdisk do

data/locale/ca/foreman_bootdisk.po

@@ -120,6 +120,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr ""
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -132,14 +135,20 @@ 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 ""
+
 msgid "Path to directory containing syslinux images"
 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."
 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 "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr ""

data/locale/de/foreman_bootdisk.po

@@ -122,6 +122,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "ISO hybrid Konvertierung fehlgeschlagen"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -134,14 +137,20 @@ msgstr "Sobald sie nacheinander geladen (Chainloading) sind, werden der OS-Bootl
 msgid "Path to directory containing iPXE images"
 msgstr "Pfad zum Verzeichnis mit iPXE-Abbildern"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Pfad zum Verzeichnis mit syslinux-Abbildern"
 
 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 "\"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 and syslinux packages are installed."
-msgstr "Bitte stellen Sie sicher, dass die Pakete ipxe-bootimgs und syslinux installiert sind."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 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."

data/locale/en/foreman_bootdisk.po

@@ -117,6 +117,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr ""
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -129,13 +132,19 @@ msgstr ""
 msgid "Path to directory containing iPXE images"
 msgstr ""
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr ""
 
 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."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
 msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."

data/locale/en_GB/foreman_bootdisk.po

@@ -122,6 +122,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "ISO hybrid conversion failed"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -134,14 +137,20 @@ msgstr "Once chainloaded, the OS bootloader and installer are downloaded directl
 msgid "Path to directory containing iPXE images"
 msgstr "Path to directory containing iPXE images"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Path to directory containing syslinux images"
 
 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 "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 "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 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."

data/locale/es/foreman_bootdisk.po

@@ -121,6 +121,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "Error en la conversión del ISO Híbrido"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -133,14 +136,20 @@ msgstr "Una vez encadenado, el bootloader del SO y el instalador se descargan di
 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 ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Ruta al directorio que contiene las imágenes 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."
 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 and syslinux packages are installed."
-msgstr "Asegúrese de que los paquetes ipxe-bootimgs y syslinux están instalados."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 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"

data/locale/foreman_bootdisk.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_bootdisk 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-11 08:17+0100\n"
-"PO-Revision-Date: 2016-05-11 08:17+0100\n"
+"POT-Creation-Date: 2016-10-10 15:13+0100\n"
+"PO-Revision-Date: 2016-10-10 15:13+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -110,51 +110,59 @@ msgstr ""
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:12
+#: ../app/models/setting/bootdisk.rb:13
 msgid "Path to directory containing iPXE images"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:12
+#: ../app/models/setting/bootdisk.rb:13
 msgid "iPXE directory"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:13
+#: ../app/models/setting/bootdisk.rb:14
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
+#: ../app/models/setting/bootdisk.rb:14
+msgid "ISOLINUX directory"
+msgstr ""
+
+#: ../app/models/setting/bootdisk.rb:15
 msgid "Path to directory containing syslinux images"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:13
+#: ../app/models/setting/bootdisk.rb:15
 msgid "SYSLINUX directory"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:14
+#: ../app/models/setting/bootdisk.rb:16
 msgid "iPXE template to use for host-specific boot disks"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:14
+#: ../app/models/setting/bootdisk.rb:16
 msgid "Host image template"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:15
+#: ../app/models/setting/bootdisk.rb:17
 msgid "iPXE template to use for generic host boot disks"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:15
+#: ../app/models/setting/bootdisk.rb:17
 msgid "Generic image template"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:16
+#: ../app/models/setting/bootdisk.rb:18
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:16
+#: ../app/models/setting/bootdisk.rb:18
 msgid "ISO generation command"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:17
+#: ../app/models/setting/bootdisk.rb:19
 msgid "Installation media files will be cached for full host images"
 msgstr ""
 
-#: ../app/models/setting/bootdisk.rb:17
+#: ../app/models/setting/bootdisk.rb:19
 msgid "Installation media caching"
 msgstr ""
 
@@ -166,16 +174,19 @@ msgstr ""
 msgid "Unable to generate disk template: %s"
 msgstr ""
 
-#: ../app/services/foreman_bootdisk/iso_generator.rb:47
-#: ../app/services/foreman_bootdisk/iso_generator.rb:60
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+#: ../app/services/foreman_bootdisk/iso_generator.rb:46
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
+
+#: ../app/services/foreman_bootdisk/iso_generator.rb:59
+msgid "Please ensure the ipxe-bootimgs package is installed."
 msgstr ""
 
-#: ../app/services/foreman_bootdisk/iso_generator.rb:80
+#: ../app/services/foreman_bootdisk/iso_generator.rb:79
 msgid "ISO build failed"
 msgstr ""
 
-#: ../app/services/foreman_bootdisk/iso_generator.rb:85
+#: ../app/services/foreman_bootdisk/iso_generator.rb:84
 msgid "ISO hybrid conversion failed"
 msgstr ""
 

data/locale/fr/foreman_bootdisk.po

@@ -121,6 +121,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "La conversion de l'image ISO hybride a échoué"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -133,14 +136,20 @@ msgstr "Une fois liés, le chargeur de démarrage (bootloader) du système et l'
 msgid "Path to directory containing iPXE images"
 msgstr "Emplacement du répertoire contenant les images iPXE"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Emplacement du répertoire contenant les images 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."
 msgstr "Les images par hôte contiennent des données spécifiques pour un hôte donné enregistré dans Foreman et configurent de manière statique les paramètres réseau, ce qui permet de s'affranchir d'un serveur DHCP. Une fois le réseau configuré, ils sont liés depuis Foreman, récupérant la configuration du système d'exploitation et l'état de construction du serveur."
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "Merci de vérifier que les paquets ipxe-bootimgs et syslinux soient installés."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin pour Foreman qui crée le démarrage des disques iPXE-bases pour provisionner les hôtes sans l'aide de l'infrastructure PXE."

data/locale/it/foreman_bootdisk.po

@@ -119,6 +119,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "Conversione ISO hybrid fallita"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -131,14 +134,20 @@ msgstr "Una volta caricato a catena il bootloader del sistema operativo e l'inst
 msgid "Path to directory containing iPXE images"
 msgstr "Percorso per la directory contentente le immagini iPXE"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Percorso per la directory contentente le immagini 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."
 msgstr "Le immagini per-host contengono i dati su un particolare host registrato in Foreman e per l'impostazione di un networking completamente statico. Così facendo non sarà necessario utilizzare DHCP. Dopo la configurazione del networking verrà eseguito un caricamento a catena da Foreman, rilevando così la configurazione del sistema operativo corrente e lo stato della compilazione del server."
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "Assicurarsi di aver installato i pacchetti syslinux e ipxe-bootimgs."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin per Foreman in grado di creare i dischi d'avvio basati su iPXE per il provisioning degli host, senza utilizzare infrastrutture PXE."

data/locale/ja/foreman_bootdisk.po

@@ -120,6 +120,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "ISO ハイブリッド変換に失敗しました"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -132,14 +135,20 @@ msgstr "チェーンロードが実行されると、OS ブートローダーと
 msgid "Path to directory containing iPXE images"
 msgstr "iPXE イメージを含むディレクトリーのパス"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "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."
 msgstr "ホストごとのイメージには、Foreman に登録された特定ホストについてのデータが含まれ、これは完全に静的なネットワークをセットアップするため、DHCP の要件が排除されます。ネットワークの設定後、Foreman からチェーンロードが実行され、現在の OS 設定やビルド状態の情報がサーバーから取得されます。"
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "ipxe-bootimgs および syslinux パッケージがインストールされていることを確認してください。"
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "PXE インストラクチャーなしにホストのプロビジョニングを行うための iPXE ベースのブートディスクを作成する Foreman のプラグインです。"

data/locale/ko/foreman_bootdisk.po

@@ -118,6 +118,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "ISO 하이브리드 변환 실패 "
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -130,14 +133,20 @@ msgstr "체인 로드가 실행되면 OS 부트로더 및 설치 프로그램은
 msgid "Path to directory containing iPXE images"
 msgstr "iPXE 이미지가 들어있는 디렉토리로의 경로 "
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "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."
 msgstr "호스트 당 이미지에는 Foreman에 등록된 특정 호스트에 대한 데이터가 포함되어 있으며 DHCP 요구 사항을 제거하여 완전하게 정적인 네트워크가 설정되어 있습니다. 네트워크 설정 후 Foreman에서 체인로드를 수행하여 현재 OS 설정 및 빌드 상태가 서버에서 검색됩니다."
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "ipxe-bootimgs 및 syslinux 패키지가 설치되었는지 확인하십시오. "
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "PXE 인프라없이 호스트 프로비저닝을 실행하기 위해 iPXE 기반 부트 디스크를 생성하는 Foreman 플러그인입니다."

data/locale/pt_BR/foreman_bootdisk.po

@@ -120,6 +120,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "Conversão da ISO híbrida falhou"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -132,14 +135,20 @@ msgstr "Uma vez carregado em série, o bootloader do SO e instalador são baixad
 msgid "Path to directory containing iPXE images"
 msgstr "Caminho do diretório contendo imagens iPXE"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Caminho do diretório contendo imagens 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."
 msgstr "Imagens per-host contêm dados sobre um determinado host registrado em Foreman e configuram a rede totalmente estática, evitando a necessidade de DHCP. Depois que a rede está configurada, eles carregam em série a partir do Foreman, pegando a configuração atual do sistema operacional e construindo o estado do servidor."
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "Por favor garanta que os pacotes ipxe-bootimgs e syslinux estejam instalados"
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin para Foreman que cria discos de inicialização baseados em iPXE para provisionar hosts sem a necessidade de infra-estrutura PXE."

data/locale/ru/foreman_bootdisk.po

@@ -122,6 +122,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "Ошибка преобразования гибридного образа"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -134,14 +137,20 @@ msgstr "После того как загрузчик ОС и установщи
 msgid "Path to directory containing iPXE images"
 msgstr "Путь к каталогу с образами iPXE"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Путь к каталогу с образами 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."
 msgstr "Образ для каждого узла содержит данные о конкретном узле, зарегистрированном в Foreman и настроен на статичную сеть, избегающую запросов по DHCP. После настройки сети, с сервера Foreman подтягивается текущая конфигурация ОС и собирается окружение сервера."
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "Убедитесь, что пакеты ipxe-bootimgs и syslinux установлены."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Дополнение для Foreman, которое создает iPXE-базовые загрузочные диски для подготовленных узлов без использования служб инфраструктуры PXE."

data/locale/sv_SE/foreman_bootdisk.po

@@ -120,6 +120,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "ISO hybridkonvertering misslyckades"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -132,14 +135,20 @@ msgstr ""
 msgid "Path to directory containing iPXE images"
 msgstr "Sökvägen till ett bibliotek med iPXE-avbildningar"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "Sökvägen till ett bibliotek med syslinux-avbildningar"
 
 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 "Vär vänlig och säkerställ att ipxe-startavbildningarna och syslinux paketen är installerade."
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "Plugin för Foreman som skapar iPXE-baserad start disk för att provisionera värdar utan en existerande PXE-infrastruktur."

data/locale/zh_CN/foreman_bootdisk.po

@@ -119,6 +119,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "ISO 复合转换失败"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -131,14 +134,20 @@ msgstr "链载入后，即可从 Foreman 中配置的安装介质直接下载 OS
 msgid "Path to directory containing iPXE images"
 msgstr "包含 iPXE 映像目录的路径"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "到包含 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."
 msgstr "每台主机映像包含有关中 Foreman 中注册的具体主机的数据，并设置静态联网，避免使用 DHCP。配置联网后，主机就可以从 Foreman 进行链载入，提取当前 OS 配置，并根据服务器构建状态。"
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "请确定已安装 ipxe-bootimgs 和 syslinux 软件包"
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "为 Foreman 生成基于 iPXE 的引导磁盘的插件，在不需要 PXE 架构的条件下即可供应主机。"

data/locale/zh_TW/foreman_bootdisk.po

@@ -119,6 +119,9 @@ msgstr ""
 msgid "ISO hybrid conversion failed"
 msgstr "ISO 混合式轉換失敗"
 
+msgid "ISOLINUX directory"
+msgstr ""
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -131,14 +134,20 @@ msgstr "在 chainload 之後，OS 開機載入程式和安裝程式將會直接
 msgid "Path to directory containing iPXE images"
 msgstr "包含 iPXE 映像檔的目錄之路徑"
 
+msgid "Path to directory containing isolinux images"
+msgstr ""
+
 msgid "Path to directory containing syslinux images"
 msgstr "包含 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."
 msgstr "個別主機的映像檔包含了有關於向 Foreman 註冊的特定主機的資料，並且會設置完整靜態的網路，以避免需要使用到 DHCP。在配置了網路後，它們便會由 Foreman 進行 chainload，取得目前的 OS 配置，並由伺服器建立狀態。"
 
-msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "請確認 ipxe-bootimgs 和 syslinux 套件已安裝。"
+msgid "Please ensure the ipxe-bootimgs package is installed."
+msgstr ""
+
+msgid "Please ensure the isolinux/syslinux package(s) are installed."
+msgstr ""
 
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "能建立基於 iPXE 的開機磁碟的 Foreman 外掛程式，以在不需要 PXE 設備的情況下佈建主機。"

data/test/functional/foreman_bootdisk/api/v2/disks_controller_test.rb

@@ -12,9 +12,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
   end
 
   describe "#host" do
-    setup :setup_org_loc
-    setup :setup_subnet
-    setup :setup_host
+    setup :setup_host_env
 
     test "should generate host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk host template/))).yields("temp ISO")
@@ -32,4 +30,25 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
       assert_equal "ISO image", @response.body
     end
   end
+
+  describe "default API version 2" do
+    setup :setup_host_env
+
+    test "path - /api/hosts/:host_id routes to #host" do
+      assert_routing "/api/hosts/#{@host.id}",
+                     :format     => "json",
+                     :apiv       => "v2",
+                     :controller => "foreman_bootdisk/api/v2/disks",
+                     :action     => "host",
+                     :id         => @host.id.to_s
+    end
+
+    test "path - /api/generic routes to #generic" do
+      assert_routing "/api/generic",
+                     :format     => "json",
+                     :apiv       => "v2",
+                     :controller => "foreman_bootdisk/api/v2/disks",
+                     :action     => "generic"
+    end
+  end
 end

data/test/test_plugin_helper.rb

@@ -7,6 +7,12 @@ class ActionController::TestCase
     setup_templates
   end
 
+  def setup_host_env
+    setup_org_loc
+    setup_subnet
+    setup_host
+  end
+
   def setup_routes
     @routes = ForemanBootdisk::Engine.routes
   end

data/test/unit/access_permissions_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+require 'unit/shared/access_permissions_test_base'
+
+class AccessPermissionsTest < ActiveSupport::TestCase
+  include AccessPermissionsTestBase
+
+  check_routes(ForemanBootdisk::Engine.routes, [])
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 8.1.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
   without the need for PXE infrastructure.
@@ -20,7 +20,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .tx/config
+- ".tx/config"
 - CHANGES.md
 - LICENSE
 - README.md
@@ -89,6 +89,7 @@ files:
 - test/functional/foreman_bootdisk/api/v2/subnet_disks_controller_test.rb
 - test/functional/foreman_bootdisk/disks_controller_test.rb
 - test/test_plugin_helper.rb
+- test/unit/access_permissions_test.rb
 - test/unit/concerns/compute_resources/vmware_test.rb
 - test/unit/concerns/host_test.rb
 - test/unit/concerns/orchestration/compute_test.rb
@@ -102,17 +103,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman