foreman_bootdisk 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51adf08513ffcceb95f046aed88d330303cdb16d
-  data.tar.gz: 4b5ca7c65af66d5f64a024f44bf7b50b7c20cad9
+  metadata.gz: ce871fad8bb1d1ebb2a0a4cb26eafc2cbfc57f33
+  data.tar.gz: d581f9c98ab0cc5741b85fcbbc58379b60389798
 SHA512:
-  metadata.gz: eec946e5bbc5be09fefd2e09f0d20ea6c69963a58018554e8998490ee422dbeaf9cbbdc6538586fbd92086da638f0ab8e4f738d84730445481fe0d043fac2bcc
-  data.tar.gz: 8b5ddcc2f1cbb5f5cfa5f86d49b3fd0c125aabb2e303f3763e041e183d6d426ec597349103b85a477f130ecba342e56c95d58a9a2249cc8e11de1189e576989d
+  metadata.gz: f905f33886dc4089e14df92b6cb54667894fefd8bfbe1a40acd76435cfede869684b6651665c3f44b5c2bf1644dbacf24056f3470ac583e5b4e5a6e68284aec3
+  data.tar.gz: b91315f9b23f5933ddd1bbd450a65146e789103e49507f07b1489327e9d7b3f9261c5b67e6e7232b71c73bef8519777ae8d8a4932ba1dcb4394c5d540c61410d

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.1.0
+* added API:
+    * /bootdisk/api/v2/generic to download the generic ISO
+    * /bootdisk/api/v2/hosts/:id to download the per-host ISO
+* refactored plugin to be an isolated engine
+
 ## v3.0.0
 * modernised to use Foreman 1.6 features, no new functionality
 * use template locking mechanism from Foreman 1.6 (#6843, Stephen Benjamin)

data/README.md

@@ -142,12 +142,19 @@ instead of being stored in the image.
 To generate the image from the web interface, view the host page, click the
 "Boot disk" button and select "Host 'FQDN' image".
 
-To generate from the command line:
+To generate from the command line on the Foreman server:
 
     foreman-rake bootdisk:generate:host NAME=foo.example.com
 
 Optionally set `OUTPUT=/path/foo.iso` to change the output destination.
 
+To generate using the Hammer CLI, install the [hammer_cli_foreman_bootdisk](https://github.com/theforeman/hammer_cli_foreman_bootdisk)
+plugin and run:
+
+    hammer bootdisk host --host client.example.com
+
+See the hammer_cli_foreman_bootdisk documentation for more advanced usage.
+
 ### Generic image
 
 This provides a single ISO that can be used by all registered hosts, but since
@@ -162,12 +169,19 @@ address statically for the installed system via the kickstart file.
 To generate the image from the web interface, view a host page, click the
 "Boot disk" button and select "Generic image".
 
-To generate from the command line:
+To generate from the command line on the Foreman server:
 
     foreman-rake bootdisk:generate:generic
 
 Optionally set `OUTPUT=/path/foo.iso` to change the output destination.
 
+To generate using the Hammer CLI, install the [hammer_cli_foreman_bootdisk](https://github.com/theforeman/hammer_cli_foreman_bootdisk)
+plugin and run:
+
+    hammer bootdisk generic
+
+See the hammer_cli_foreman_bootdisk documentation for more advanced usage.
+
 ### Host group images
 
 TODO

data/app/controllers/foreman_bootdisk/api/v2/disks_controller.rb

@@ -0,0 +1,60 @@
+require 'uri'
+
+module ForemanBootdisk
+  module Api
+    module V2
+      class DisksController < ::Api::V2::BaseController
+        include ::Api::Version2
+
+        resource_description do
+          api_base_url "/bootdisk/api"
+        end
+
+        before_filter :find_host, :only => :host
+
+        # no-op, but required for apipie documentation
+        api :GET, '', N_('Boot disks')
+        def index; end
+
+        api :GET, '/generic', N_('Download generic image')
+        def generic
+          tmpl = ForemanBootdisk::Renderer.new.generic_template_render
+          ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
+            send_data File.read(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
+          end
+        end
+
+        api :GET, '/hosts/:host_id', N_('Download host image')
+        param :host_id, :identifier_dottable, :required => true
+        def host
+          host = @disk
+          tmpl = host.bootdisk_template_render
+          ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
+            send_data File.read(iso), :filename => "#{host.name}.iso"
+          end
+        end
+
+        private
+
+        def action_permission
+          case params[:action]
+            when 'generic'
+              :download
+            when 'host'
+              :view
+          else
+            super
+          end
+        end
+
+        def find_host
+          find_resource('hosts')
+        end
+
+        def resource_class
+          Host::Managed
+        end
+      end
+    end
+  end
+end

data/app/controllers/foreman_bootdisk/disks_controller.rb

@@ -2,7 +2,9 @@ require 'uri'
 
 module ForemanBootdisk
   class DisksController < ::ApplicationController
-    def generic_iso
+    before_filter :find_by_name, :only => %w[host]
+
+    def generic
       begin
         tmpl = ForemanBootdisk::Renderer.new.generic_template_render
       rescue => e
@@ -16,15 +18,25 @@ module ForemanBootdisk
       end
     end
 
-    private
+    def host
+      host = @disk
+      begin
+        tmpl = host.bootdisk_template_render
+      rescue => e
+        error _('Failed to render boot disk template: %s') % e
+        redirect_to :back
+        return
+      end
 
-    def action_permission
-      case params[:action]
-        when 'generic_iso'
-          :download
-      else
-        super
+      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
+        send_data File.read(iso), :filename => "#{host.name}.iso"
       end
     end
+
+    private
+
+    def resource_base
+      Host::Managed.authorized(:view_hosts)
+    end
   end
 end

data/app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -9,12 +9,28 @@ module ForemanBootdisk::HostsHelperExt
     title_actions(
       button_group(
         select_action_button(_('Boot disk'), {},
-          display_link_if_authorized(_("Host '%s' image") % @host.name.split('.')[0], hash_for_bootdisk_iso_host_path(:id => @host), :class=>'btn'),
-          display_link_if_authorized(_("Generic image"), hash_for_generic_iso_disks_path, :class=>'btn')
+          display_bootdisk_link_if_authorized(_("Host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'host', :id => @host}, :class=>'btn'),
+          display_bootdisk_link_if_authorized(_("Generic image"), {:controller => 'foreman_bootdisk/disks', :action => 'generic'}, :class=>'btn')
         )
       )
     )
     host_title_actions_without_bootdisk(*args)
   end
 
+  # Core Foreman helpers can't look up a URL against a mounted engine
+  def display_bootdisk_link_if_authorized(name, options = {}, html_options = {})
+    if bootdisk_authorized_for(options)
+      link_to(name, bootdisk_url(options), html_options)
+    else
+      ""
+    end
+  end
+
+  def bootdisk_url(options)
+    ForemanBootdisk::Engine.routes.url_for(options.merge(:only_path => true))
+  end
+
+  def bootdisk_authorized_for(options)
+    User.current.allowed_to?(options)
+  end
 end

data/config/routes.rb

@@ -1,12 +1,16 @@
-Rails.application.routes.draw do
-  resources :disks, :module => 'foreman_bootdisk', :only => :index do
-    get 'generic_iso', :on => :collection
+ForemanBootdisk::Engine.routes.draw do
+  resources :disks, :only => [] do
+    get 'generic', :on => :collection
+    constraints(:id => /[^\/]+/) do
+      get 'hosts/:id', :on => :collection, :to => 'disks#host'
+    end
   end
 
-  constraints(:id => /[^\/]+/) do
-    resources :hosts do
-      member do
-        get 'bootdisk_iso'
+  namespace :api, :defaults => {:format => 'json'} do
+    scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'}, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
+      get 'generic', :to => 'disks#generic'
+      constraints(:id => /[^\/]+/) do
+        get 'hosts/:id', :to => 'disks#host'
       end
     end
   end

data/config/routes/mount_engine.rb

@@ -0,0 +1,3 @@
+Foreman::Application.routes.draw do
+  mount ForemanBootdisk::Engine, :at => "/bootdisk"
+end

data/lib/foreman_bootdisk/engine.rb

@@ -4,12 +4,16 @@ require 'gettext_i18n_rails'
 
 module ForemanBootdisk
   class Engine < ::Rails::Engine
-    engine_name ForemanBootdisk::ENGINE_NAME
+    isolate_namespace ForemanBootdisk
 
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
 
+    initializer 'foreman_bootdisk.mount_engine', :after=> :build_middleware_stack do |app|
+      app.routes_reloader.paths << "#{ForemanBootdisk::Engine.root}/config/routes/mount_engine.rb"
+    end
+
     initializer 'foreman_bootdisk.load_default_settings', :before => :load_config_initializers do |app|
       require_dependency File.expand_path("../../../app/models/setting/bootdisk.rb", __FILE__) if (Setting.table_exists? rescue(false))
     end
@@ -18,18 +22,23 @@ module ForemanBootdisk
       app.config.paths['db/migrate'] += ForemanBootdisk::Engine.paths['db/migrate'].existent
     end
 
+    initializer "foreman_bootdisk.apipie" do
+      Apipie.configuration.api_controllers_matcher << "#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"
+      Apipie.configuration.checksum_path += ['/bootdisk/api/']
+    end
+
     initializer 'foreman_bootdisk.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
         requires_foreman '>= 1.6'
 
         security_block :bootdisk do |map|
-          permission :download_bootdisk, {:hosts => [:bootdisk_iso],
-                                          :'bootdisk/disks' => [:generic_iso, :index]}
+          permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host],
+                                          :'foreman_bootdisk/api/v2/disks' => [:generic, :host]}
         end
 
-        role "Boot disk access", [:download_bootdisk] unless (Role.count rescue nil).nil?
+        role "Boot disk access", [:download_bootdisk]
 
-        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise if respond_to? :allowed_template_helpers
+        allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
       end
     end
 
@@ -42,7 +51,6 @@ module ForemanBootdisk
     config.to_prepare do
       begin
         Host::Managed.send(:include, ForemanBootdisk::HostExt)
-        HostsController.send(:include, ForemanBootdisk::HostsControllerExt)
         HostsHelper.send(:include, ForemanBootdisk::HostsHelperExt)
         UnattendedController.send(:include, ForemanBootdisk::UnattendedControllerExt)
       rescue => e

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '3.0.0'
+  VERSION = '3.1.0'
 end

data/locale/de/foreman_bootdisk.po

@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:18+0000\n"
-"PO-Revision-Date: 2014-07-09 08:11+0000\n"
-"Last-Translator: simon11 <simon.stieger.98@live.de>\n"
+"POT-Creation-Date: 2014-08-05 17:10+0100\n"
+"PO-Revision-Date: 2014-08-06 08:59+0000\n"
+"Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,17 +63,17 @@ msgstr "Pfad zum Verzeichnis mit syslinux Images"
 msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
 msgstr "Bitte stelle sicher, dass die Pakete ipxe-bootimgs und syslinux installiert sind."
 
+msgid ""
+"Plugin for Foreman that creates iPXE-based boot disks to provision hosts "
+"without the need for PXE infrastructure."
+msgstr ""
+
 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 ""
-"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
-"to a new template to customize."
-msgstr "Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customize."
-
 msgid "Unable to find template specified by %s setting"
 msgstr "Konnte Vorlage mit der %s-Einstellung nicht finden"
 

data/locale/en/foreman_bootdisk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 10:56+0100\n"
+"POT-Creation-Date: 2014-08-08 13:53+0100\n"
 "PO-Revision-Date: 2014-02-13 12:09+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
@@ -20,12 +20,21 @@ msgstr ""
 msgid "Boot disk"
 msgstr ""
 
+msgid "Boot disks"
+msgstr ""
+
 msgid "Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings"
 msgstr ""
 
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr ""
 
+msgid "Download generic image"
+msgstr ""
+
+msgid "Download host image"
+msgstr ""
+
 msgid "Failed to render boot disk template: %s"
 msgstr ""
 
@@ -59,6 +68,9 @@ msgstr ""
 msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
 msgstr ""
 
+msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
+msgstr ""
+
 msgid "Subnet (%s) has no gateway defined"
 msgstr ""
 

data/locale/en_GB/foreman_bootdisk.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:18+0000\n"
-"PO-Revision-Date: 2014-02-13 12:20+0000\n"
+"POT-Creation-Date: 2014-08-05 17:10+0100\n"
+"PO-Revision-Date: 2014-08-06 09:00+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/foreman/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -62,17 +62,17 @@ msgstr "Path to directory containing syslinux images"
 msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
 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 "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 ""
-"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
-"to a new template to customize."
-msgstr "Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customise."
-
 msgid "Unable to find template specified by %s setting"
 msgstr "Unable to find template specified by %s setting"
 

data/locale/es/foreman_bootdisk.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:18+0000\n"
-"PO-Revision-Date: 2014-05-21 10:02+0000\n"
+"POT-Creation-Date: 2014-08-05 17:10+0100\n"
+"PO-Revision-Date: 2014-08-06 09:20+0000\n"
 "Last-Translator: Sergio Ocón <sergio@redhat.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/foreman/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -62,17 +62,17 @@ msgstr "Ruta al directorio que contiene las imágenes syslinux"
 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 ""
+"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 "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 ""
-"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
-"to a new template to customize."
-msgstr "La plantilla es de solo lectura al proporcionarse en foreman_bootdisk. Cópiela en una nueva plantilla para customizarla"
-
 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"
 

data/locale/foreman_bootdisk.pot

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: version 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-05 10:56+0100\n"
+"POT-Creation-Date: 2014-08-08 13:53+0100\n"
 "PO-Revision-Date: 2014-02-13 12:09+0000\n"
 "Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: Foreman Team <foreman-dev@googlegroups.com>\n"
@@ -20,12 +20,21 @@ msgstr ""
 msgid "Boot disk"
 msgstr ""
 
+msgid "Boot disks"
+msgstr ""
+
 msgid "Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings"
 msgstr ""
 
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr ""
 
+msgid "Download generic image"
+msgstr ""
+
+msgid "Download host image"
+msgstr ""
+
 msgid "Failed to render boot disk template: %s"
 msgstr ""
 
@@ -59,6 +68,9 @@ msgstr ""
 msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
 msgstr ""
 
+msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
+msgstr ""
+
 msgid "Subnet (%s) has no gateway defined"
 msgstr ""
 

data/locale/fr/foreman_bootdisk.po

@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Claer <transiblu@claer.hammock.fr>, 2014
+# Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:18+0000\n"
-"PO-Revision-Date: 2014-02-13 18:20+0000\n"
-"Last-Translator: Claer <transiblu@claer.hammock.fr>\n"
+"POT-Creation-Date: 2014-08-05 17:10+0100\n"
+"PO-Revision-Date: 2014-08-06 09:11+0000\n"
+"Last-Translator: Pierre-Emmanuel Dutang <dutangp@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/foreman/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,17 +63,17 @@ msgstr "Emplacement du répertoire contenant les images syslinux"
 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 ""
+"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."
+
 msgid "Subnet (%s) has no gateway defined"
 msgstr "Le sous réseau (%s) n'a pas de passerelle définie"
 
 msgid "Subnet (%s) has no primary DNS server defined"
 msgstr "Le sous réseau (%s) n'a pas de serveur DNS primaire défini"
 
-msgid ""
-"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
-"to a new template to customize."
-msgstr "Le modèle est en lecture seule car il est fourni par foreman_bootdisk. Merci de le recopier vers un nouveau modèle pour avoir une version éditable."
-
 msgid "Unable to find template specified by %s setting"
 msgstr "Impossible de trouver un modèle spécifié par le paramètre %s"
 

data/locale/gemspec.rb

@@ -0,0 +1,2 @@
+# Matches foreman_bootdisk.gemspec
+_("Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure.")

data/locale/pt_BR/foreman_bootdisk.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:18+0000\n"
-"PO-Revision-Date: 2014-03-30 04:00+0000\n"
-"Last-Translator: Flamarion Jorge Flamarion <jorge.flamarion@gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 17:10+0100\n"
+"PO-Revision-Date: 2014-08-06 08:59+0000\n"
+"Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/foreman/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -61,17 +61,17 @@ msgstr "Caminho do diretório contendo imagens syslinux"
 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 ""
+"Plugin for Foreman that creates iPXE-based boot disks to provision hosts "
+"without the need for PXE infrastructure."
+msgstr ""
+
 msgid "Subnet (%s) has no gateway defined"
 msgstr "Subrede (%s) não tem um gateway definido"
 
 msgid "Subnet (%s) has no primary DNS server defined"
 msgstr "Subrede (%s) não tem um servidor DNS primário definido"
 
-msgid ""
-"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
-"to a new template to customize."
-msgstr "Template está somente leitura como é fornecido em foreman_bootdisk. Por favor copie para um novo modelo e personalize."
-
 msgid "Unable to find template specified by %s setting"
 msgstr "Impossível encontrar template especificado pela configuração %s"
 

data/locale/sv_SE/foreman_bootdisk.po

@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-13 12:18+0000\n"
-"PO-Revision-Date: 2014-02-18 11:20+0000\n"
-"Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>\n"
+"POT-Creation-Date: 2014-08-05 17:10+0100\n"
+"PO-Revision-Date: 2014-08-06 08:59+0000\n"
+"Last-Translator: Dominic Cleal <dcleal@redhat.com>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/foreman/language/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -62,17 +62,17 @@ msgstr "Sökvägen till ett bibliotek med syslinux-avbildningar"
 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 ""
+"Plugin for Foreman that creates iPXE-based boot disks to provision hosts "
+"without the need for PXE infrastructure."
+msgstr ""
+
 msgid "Subnet (%s) has no gateway defined"
 msgstr "Subnät (%s) har ingen nätsluss definierad"
 
 msgid "Subnet (%s) has no primary DNS server defined"
 msgstr "Subnät (%s) har ingen primär DNS-server definierad"
 
-msgid ""
-"Template is read-only as it's supplied in foreman_bootdisk.  Please copy it "
-"to a new template to customize."
-msgstr "Mallen är skrivskyddad eftersom den används i \"foreman_bootdisk\". Var vänligt och kopiera den till en ny mall för att ändra."
-
 msgid "Unable to find template specified by %s setting"
 msgstr "Går inte att hitta mallen specificerad med inställningen %s"
 

data/locale/zanata.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<config xmlns="http://zanata.org/namespace/config/">
+    <url>https://translate.zanata.org/zanata/</url>
+    <project>satellite6-foreman-bootdisk</project>
+    <project-version>6.0</project-version>
+    <project-type>podir</project-type>
+    <locales>
+        <locale>fr</locale>
+        <locale>it</locale>
+        <locale>ja</locale>
+        <locale>ko</locale>
+        <locale>gu</locale>
+        <locale>hi</locale>
+        <locale>mr</locale>
+        <locale>or</locale>
+        <locale>ru</locale>
+        <locale>te</locale>
+        <locale>pa</locale>
+        <locale>kn</locale>
+        <locale map-from="de">de-DE</locale>
+        <locale map-from="es">es-ES</locale>
+        <locale map-from="pt_BR">pt-BR</locale>
+        <locale map-from="bn">bn-IN</locale>
+        <locale map-from="ta">ta-IN</locale>
+        <locale map-from="zh_CN">zh-Hans-CN</locale>
+        <locale map-from="zh_TW">zh-Hant-TW</locale>
+    </locales>
+</config>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-08 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.
@@ -25,8 +25,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/concerns/foreman_bootdisk/hosts_controller_ext.rb
 - app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb
+- app/controllers/foreman_bootdisk/api/v2/disks_controller.rb
 - app/controllers/foreman_bootdisk/disks_controller.rb
 - app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb
 - app/models/concerns/foreman_bootdisk/host_ext.rb
@@ -36,6 +36,7 @@ files:
 - app/views/foreman_bootdisk/generic_host.erb
 - app/views/foreman_bootdisk/host.erb
 - config/routes.rb
+- config/routes/mount_engine.rb
 - db/migrate/20130914211030_create_host_bootdisk_template.rb
 - db/migrate/20130915104500_edit_host_bootdisk_template_multinic.rb
 - db/migrate/20130915133321_create_kickstart_bootdisk_template.rb
@@ -53,8 +54,10 @@ files:
 - locale/es/foreman_bootdisk.po
 - locale/foreman_bootdisk.pot
 - locale/fr/foreman_bootdisk.po
+- locale/gemspec.rb
 - locale/pt_BR/foreman_bootdisk.po
 - locale/sv_SE/foreman_bootdisk.po
+- locale/zanata.xml
 homepage: http://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3

data/app/controllers/concerns/foreman_bootdisk/hosts_controller_ext.rb

@@ -1,31 +0,0 @@
-module ForemanBootdisk::HostsControllerExt
-  extend ActiveSupport::Concern
-
-  included do
-    alias_method :find_by_name_bootiso, :find_by_name
-    before_filter :find_by_name_bootiso, :only => %w[bootdisk_iso]
-    alias_method_chain :current_permission, :bootdisk if method_defined?(:current_permission)
-  end
-
-  def bootdisk_iso
-    begin
-      tmpl = @host.bootdisk_template_render
-    rescue => e
-      error _('Failed to render boot disk template: %s') % e
-      redirect_to :back
-      return
-    end
-
-    ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
-      send_data File.read(iso), :filename => "#{@host.name}.iso"
-    end
-  end
-
-  def current_permission_with_bootdisk
-    if params[:action] == 'bootdisk_iso'
-      'download_bootdisk'
-    else
-      current_permission_without_bootdisk
-    end
-  end
-end