foreman_bootdisk 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93c51e52b750e4913f2733baea4ab7a45521360e
-  data.tar.gz: c336a695f574ac6e8f6cb8cfeb9b1a04dc31bbb8
+  metadata.gz: a7d9d5c7d08c4fbdd36d96a0ba1da3f6c2100f3f
+  data.tar.gz: 3a57d414fd37afbaa302efa93995455a0fedc1da
 SHA512:
-  metadata.gz: 439e5ed6f401fd360a0e8e8d4f7f4b663f8c716e89fa729de915c62e44a05dad9ef7679a76ecc6fb4b4f5c30ffe4b5387b20e2567212113a813791a1798a2819
-  data.tar.gz: 08fad9a3fcd01e8192a39533bc1a6da3a7f41d7d3be4b29aa00eb3533a8b3812c9c39958181cb99b3b248ed106f6990849f921459f0eae049bbce4c6977409a6
+  metadata.gz: 04039858a9dde5442a877d40f845e159f21cdcde8972149d4e0c8cb540dc6a3221d5b18f6d36a14610604993e0f942d50ed65bd805bebb5a104652b9411785d6
+  data.tar.gz: 38e34c53e31d0b330db0433ac64abf87b620586b2b951f577b5ba36ee138c57e874cf003203d2d902f5aed2874d788621dc0f8242a017a1ee9d364795ca6d1b5

data/.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[foreman.bootdisk]
+file_filter = locale/<lang>/bootdisk.po
+source_file = locale/bootdisk.pot
+source_lang = en
+type = PO

data/CHANGES.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## v2.0.2
+* add MAC address to iPXE chain request for NAT (#3562, Jon Fautley)
+* raise friendly error if safemode is enabled (#4184, #2948)
+* add i18n framework and en_GB translation (#3981)
+* fix filename of generic ISO image
+* fix template deletion blocking
+* update instructions for Debian
+
 ## v2.0.1
 * use genisoimage instead of mkisofs by default, added setting to control
 * fix translation extraction of setting descriptions

data/README.md

@@ -21,6 +21,8 @@ The gem name is "foreman_bootdisk".  Run `foreman-rake db:migrate`,
 RPM users can install the "ruby193-rubygem-foreman_bootdisk" or
 "rubygem-foreman_bootdisk" packages.
 
+Debian users can install the "ruby-foreman-bootdisk" package.
+
 ## Dependencies
 
 * iPXE images are required
@@ -61,17 +63,20 @@ 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.
 
-An OS iPXE provisioning template is required, preferably "Kickstart default
-iPXE".  Ensure the OSes are ticked under the Associations tab and that the
+An OS iPXE provisioning template is required, see the list below for the name.
+Ensure the OSes are ticked under the Associations tab and that the
 iPXE template is selected under the Templates tab on the OS.
 
+* Kickstart (EL/Fedora) OSes, use "Kickstart default iPXE"
+* Preseed (Debian/Ubuntu) OSes, use "Preseed default iPXE"
+
 Lastly, the OS provision template (i.e. kickstart/preseed) should provide the
 static IP details required to configure the OS.  For a kickstart file, the
 following configuration will do this:
 
     network --bootproto <%= @static ? "static" : "dhcp" %> --hostname <%= @host %> <%= "--ip=#{@host.ip} --netmask=#{@host.subnet.mask} --gateway=#{@host.subnet.gateway} --nameserver=#{@host.subnet.dns_primary},#{@host.subnet.dns_secondary}" if @static %>
 
-Foreman's default kickstart file is ready to use.
+Foreman's default kickstart and preseed files are ready to use.
 
 ## Available images
 
@@ -157,7 +162,6 @@ Report issues on the Redmine project: [foreman_bootdisk](http://projects.thefore
 
 ## Known issues
 
-* No Debian guidance or templates
 * No SELinux policy support
 
 # Copyright

data/Rakefile

@@ -0,0 +1,105 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'rake'
+require 'fileutils'
+
+task :default => :test
+
+PLUGIN_NAME = "bootdisk"
+ENGINE_DIR = File.expand_path('..', __FILE__)
+FOREMAN_DIR = '.foreman_app'
+
+ENV['TEXTDOMAIN'] = PLUGIN_NAME
+import "#{FOREMAN_DIR}/Rakefile" if File.exists? "#{FOREMAN_DIR}/Rakefile"
+
+namespace :setup do
+  desc "Download latest foreman core devel source and install dependencies"
+  task :foreman_prepare do
+    foreman_repo = 'https://github.com/theforeman/foreman.git'
+    foreman_gemfile = File.join(FOREMAN_DIR, "Gemfile")
+    unless File.exists?(foreman_gemfile)
+      puts "Foreman source code is not present at #{FOREMAN_DIR}"
+      puts "Downloading latest Foreman development branch into #{FOREMAN_DIR}..."
+      FileUtils.mkdir_p(FOREMAN_DIR)
+
+      unless system("git clone --depth 1 #{foreman_repo} #{FOREMAN_DIR}")
+        puts "Error while getting latest Foreman code from #{foreman_repo} into #{FOREMAN_DIR}"
+        fail
+      end
+    end
+
+    settings_file = "#{FOREMAN_DIR}/config/settings.yaml"
+    unless File.exists?(settings_file)
+      puts 'Preparing settings file'
+      FileUtils.copy("#{settings_file}.example", settings_file)
+    end
+
+    db_file = "#{FOREMAN_DIR}/config/database.yml"
+    unless File.exists?(db_file)
+      puts 'Preparing database file'
+      FileUtils.copy("#{db_file}.example", db_file)
+    end
+
+    ["#{ENGINE_DIR}/.bundle/config", "#{FOREMAN_DIR}/.bundle/config"].each do |bundle_file|
+      unless File.exists?(bundle_file)
+        FileUtils.mkdir_p(File.dirname(bundle_file))
+        puts 'Preparing bundler configuration'
+        File.open(bundle_file, 'w') { |f| f << <<FILE }
+---
+BUNDLE_WITHOUT: console:development:fog:gce:jsonp:libvirt:mysql:mysql2:ovirt:postgresql:vmware
+FILE
+      end
+    end
+
+    local_gemfile = "#{FOREMAN_DIR}/bundler.d/Gemfile.local.rb"
+    unless File.exist?(local_gemfile)
+      File.open(local_gemfile, 'w') { |f| f << <<GEMFILE }
+gem "facter"
+GEMFILE
+    end
+
+    puts 'Installing dependencies...'
+    unless system('bundle install')
+      fail
+    end
+  end
+
+  task :db_prepare do
+    unless File.exists?(FOREMAN_DIR)
+      puts <<MESSAGE
+Foreman source code not prepared. Run
+
+  rake setup:foreman_prepare
+
+to download foreman source and its dependencies
+MESSAGE
+      fail
+    end
+
+    # once we are Ruby19 only, switch to block variant of cd
+    pwd = FileUtils.pwd
+    FileUtils.cd(FOREMAN_DIR)
+    unless system('bundle exec rake db:test:prepare RAILS_ENV=test')
+      puts "Migrating database first"
+      system('bundle exec rake db:migrate db:schema:dump') || fail
+    end
+    FileUtils.cd(pwd)
+  end
+
+  task :all => [:foreman_prepare, :db_prepare]
+end
+
+namespace :test do
+  task :set_loadpath do
+    %w[lib test].each do |dir|
+      $:.unshift(File.expand_path(dir, ENGINE_DIR))
+    end
+  end
+
+  task :all => ['setup:db_prepare', 'test:set_loadpath'] do
+    Dir.glob('test/**/*_test.rb') { |f| require f.sub('test/','') unless f.include? '.foreman_app/' }
+  end
+end
+
+task :test => 'test:all'

data/app/controllers/bootdisk/disks_controller.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module Bootdisk
   class DisksController < ::ApplicationController
     def generic_iso
@@ -10,7 +12,7 @@ module Bootdisk
       end
 
       Bootdisk::ISOGenerator.new(tmpl).generate do |iso|
-        send_data File.read(iso), :filename => "bootdisk_#{Setting[:foreman_url]}.iso"
+        send_data File.read(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
       end
     end
   end

data/app/models/concerns/bootdisk/config_template_ext.rb

@@ -3,7 +3,7 @@
 module Bootdisk::ConfigTemplateExt
   extend ActiveSupport::Concern
 
-  BOOTDISK_TMPLS = ['Boot disk iPXE - host', 'Kickstart boot disk iPXE']
+  BOOTDISK_TMPLS = ['Boot disk iPXE - host', 'Boot disk iPXE - generic host']
 
   included do
     before_destroy :bootdisk_destroy?
@@ -12,8 +12,8 @@ module Bootdisk::ConfigTemplateExt
 
   def bootdisk_destroy?
     return true if ARGV.find { |a| a.start_with? "db:migrate" }
-    bootdisk_readonly
-    errors.empty?
+    bootdisk_add_error if BOOTDISK_TMPLS.include?(name)
+    false
   end
 
   def bootdisk_readonly
@@ -29,8 +29,10 @@ module Bootdisk::ConfigTemplateExt
 
     # allow the user to associate it, just not change the content
     other_attrs = c.keys.find { |f| !['template_combinations', 'template_associations'].include? f }
-    if BOOTDISK_TMPLS.include?(name_was) && other_attrs
-      errors.add(:base, _("Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customize."))
-    end
+    bootdisk_add_error if BOOTDISK_TMPLS.include?(name_was) && other_attrs
+  end
+
+  def bootdisk_add_error
+    errors.add(:base, _("Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customize."))
   end
 end

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

@@ -6,6 +6,9 @@ module Bootdisk::HostExt
   end
 
   def bootdisk_template_render
+    # Waiting on additional whitelisted items, #2948
+    Setting[:safemode_render] && raise(::Foreman::Exception.new(N_('Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings')))
+
     @host = self
     pxe_render(bootdisk_template.template)
   end

data/app/services/bootdisk/renderer.rb

@@ -4,6 +4,9 @@ module Bootdisk
     include Rails.application.routes.url_helpers
 
     def generic_template_render
+      # Waiting on additional whitelisted items, #2948
+      Setting[:safemode_render] && raise(::Foreman::Exception.new(N_('Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings')))
+
       tmpl = ConfigTemplate.find_by_name(Setting[:bootdisk_generic_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_generic_host_template'))
       @host = Struct.new(:token).new(nil)
       unattended_render(tmpl.template)

data/app/views/bootdisk/host.erb

@@ -37,7 +37,7 @@ set domain <%= @host.domain.to_s %>
 
 # Chainload from Foreman rather than embedding OS info here, so the behaviour
 # is entirely dynamic.
-chain <%= foreman_url("iPXE") %>
+chain <%= (u = URI.parse(foreman_url("iPXE")); u.query ="#{u.query}&mac=#{@host.mac}"; u.to_s) %>
 exit 0
 
 :no_nic

data/lib/bootdisk/engine.rb

@@ -1,4 +1,6 @@
 require 'foreman_bootdisk'
+require 'fast_gettext'
+require 'gettext_i18n_rails'
 
 module Bootdisk
   class Engine < ::Rails::Engine
@@ -16,7 +18,7 @@ module Bootdisk
       app.config.paths['db/migrate'] += Bootdisk::Engine.paths['db/migrate'].existent
     end
 
-    initializer 'my_plugin.register_plugin', :after=> :finisher_hook do |app|
+    initializer 'foreman_bootdisk.register_plugin', :after=> :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
         requires_foreman '>= 1.4'
 
@@ -29,6 +31,12 @@ module Bootdisk
       end
     end
 
+    initializer 'foreman_bootdisk.register_gettext', :after => :load_config_initializers do |app|
+      locale_dir = File.join(File.expand_path('../../..', __FILE__), 'locale')
+      locale_domain = 'bootdisk'
+      Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
+    end
+
     config.to_prepare do
       begin
         ConfigTemplate.send(:include, Bootdisk::ConfigTemplateExt)

data/lib/bootdisk/version.rb

@@ -1,3 +1,3 @@
 module Bootdisk
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/locale/Makefile

@@ -0,0 +1,6 @@
+#
+# Makefile for PO merging and MO generation. For more info see
+# locale/README in the Foreman Core.
+#
+include ../.foreman_app/locale/Makefile
+DOMAIN = bootdisk

data/locale/bootdisk.pot

@@ -0,0 +1,78 @@
+# foreman_bootdisk
+#
+# This file is distributed under the same license as foreman_bootdisk.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 12:18+0000\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+msgid "Boot disk"
+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 "Failed to render boot disk template: %s"
+msgstr ""
+
+msgid "Generic image"
+msgstr ""
+
+msgid "Host '%s' image"
+msgstr ""
+
+msgid "Host has no IP address defined"
+msgstr ""
+
+msgid "Host has no domain defined"
+msgstr ""
+
+msgid "Host has no subnet defined"
+msgstr ""
+
+msgid "ISO build failed"
+msgstr ""
+
+msgid "ISO hybrid conversion failed"
+msgstr ""
+
+msgid "Path to directory containing iPXE images"
+msgstr ""
+
+msgid "Path to directory containing syslinux images"
+msgstr ""
+
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr ""
+
+msgid "Subnet (%s) has no gateway defined"
+msgstr ""
+
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr ""
+
+msgid "Template is read-only as it's supplied in foreman_bootdisk.  Please copy it to a new template to customize."
+msgstr ""
+
+msgid "Unable to find template specified by %s setting"
+msgstr ""
+
+msgid "iPXE template to use for generic host boot disks"
+msgstr ""
+
+msgid "iPXE template to use for host-specific boot disks"
+msgstr ""

data/locale/en_GB/bootdisk.po

@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# domcleal <dcleal@redhat.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Foreman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-02-13 12:09+0000\n"
+"PO-Revision-Date: 2014-02-13 12:14+0000\n"
+"Last-Translator: domcleal <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"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: app/services/bootdisk/iso_generator.rb:25
+msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+msgstr "Please ensure the ipxe-bootimgs and syslinux packages are installed."
+
+#: app/services/bootdisk/iso_generator.rb:34
+msgid "ISO build failed"
+msgstr "ISO build failed"
+
+#: app/services/bootdisk/iso_generator.rb:39
+msgid "ISO hybrid conversion failed"
+msgstr "ISO hybrid conversion failed"
+
+#: app/services/bootdisk/renderer.rb:8
+#: app/models/concerns/bootdisk/host_ext.rb:10
+msgid ""
+"Bootdisk is not supported with safemode rendering, please disable "
+"safemode_render under Adminster>Settings"
+msgstr "Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings"
+
+#: app/services/bootdisk/renderer.rb:10
+#: app/models/concerns/bootdisk/host_ext.rb:5
+msgid "Unable to find template specified by %s setting"
+msgstr "Unable to find template specified by %s setting"
+
+#: app/controllers/bootdisk/disks_controller.rb:9
+#: app/controllers/concerns/bootdisk/hosts_controller_ext.rb:13
+msgid "Failed to render boot disk template: %s"
+msgstr "Failed to render boot disk template: %s"
+
+#: app/models/setting/bootdisk.rb:11
+msgid "Path to directory containing iPXE images"
+msgstr "Path to directory containing iPXE images"
+
+#: app/models/setting/bootdisk.rb:12
+msgid "Path to directory containing syslinux images"
+msgstr "Path to directory containing syslinux images"
+
+#: app/models/setting/bootdisk.rb:13
+msgid "iPXE template to use for host-specific boot disks"
+msgstr "iPXE template to use for host-specific boot disks"
+
+#: app/models/setting/bootdisk.rb:14
+msgid "iPXE template to use for generic host boot disks"
+msgstr "iPXE template to use for generic host boot disks"
+
+#: app/models/setting/bootdisk.rb:15
+msgid "Command to generate ISO image, use genisoimage or mkisofs"
+msgstr "Command to generate ISO image, use genisoimage or mkisofs"
+
+#: app/models/concerns/bootdisk/config_template_ext.rb:33
+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."
+
+#: app/helpers/concerns/bootdisk/hosts_helper_ext.rb:11
+msgid "Boot disk"
+msgstr "Boot disk"
+
+#: app/helpers/concerns/bootdisk/hosts_helper_ext.rb:12
+msgid "Host '%s' image"
+msgstr "Host '%s' image"
+
+#: app/helpers/concerns/bootdisk/hosts_helper_ext.rb:13
+msgid "Generic image"
+msgstr "Generic image"
+
+#: app/views/bootdisk/host.erb:8
+msgid "Host has no IP address defined"
+msgstr "Host has no IP address defined"
+
+#: app/views/bootdisk/host.erb:9
+msgid "Host has no subnet defined"
+msgstr "Host has no subnet defined"
+
+#: app/views/bootdisk/host.erb:10
+msgid "Host has no domain defined"
+msgstr "Host has no domain defined"
+
+#: app/views/bootdisk/host.erb:11
+msgid "Subnet (%s) has no gateway defined"
+msgstr "Subnet (%s) has no gateway defined"
+
+#: app/views/bootdisk/host.erb:12
+msgid "Subnet (%s) has no primary DNS server defined"
+msgstr "Subnet (%s) has no primary DNS server defined"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Dominic Cleal
@@ -20,9 +20,11 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- .tx/config
 - CHANGES.md
 - LICENSE
 - README.md
+- Rakefile
 - app/controllers/bootdisk/disks_controller.rb
 - app/controllers/concerns/bootdisk/hosts_controller_ext.rb
 - app/controllers/concerns/bootdisk/unattended_controller_ext.rb
@@ -45,6 +47,9 @@ files:
 - lib/bootdisk/version.rb
 - lib/foreman_bootdisk.rb
 - lib/tasks/bootdisk.rake
+- locale/Makefile
+- locale/bootdisk.pot
+- locale/en_GB/bootdisk.po
 homepage: http://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3
@@ -55,17 +60,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.2.1
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman