foreman_bootdisk 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67fc0c4eef2ddf1d89a2bcf54e51d512b288c236
-  data.tar.gz: 20961f842f4935e25aa1199ec689cd71cd3d8cac
+  metadata.gz: 1efb079d68935777825c7c979322ded482808c4a
+  data.tar.gz: a01ad93b9680558aac5234bc7f9b1545076a22c6
 SHA512:
-  metadata.gz: 8cf0e620cf0be77b0f9f7d0e31d52b6b2b8b54e01d6beaf3939b347f4ccdd95f65303ef6887de2507e365f4edc44713679b3b7b2d66da1ee1652e76e5f928899
-  data.tar.gz: 768f6c53c58a23765dd4efe51098034e493458da848aff66b362a30a9010e6434c7467afd0b45294bfc0f898fadd1f9e585efdc18e9492809cb2e9f20c786baf
+  metadata.gz: 2866d33e1fdf7dfd4280aa0ddcc2306172e495a9a253eed2b889b030bce787209e0f5491546c95c6a39452fee6e1e468877b9ba335b1645b85f73c4e8d1c0a0e
+  data.tar.gz: be89f39658774049af6d8f62126e573b0f69bcedee8913a0d3caa35575a5d95f77a98495cbd694a06b69b414e3c91bba0bd1ec5d516dcb5bfb89c0cb0503b36e

data/CHANGES.md

@@ -1,8 +1,16 @@
 # Changelog
 
+## v4.0.1
+* rake task accepts a dir for the output path, and falls back to a temporary
+  directory if the cwd is not writable (#7370)
+
 ## v4.0.0
 * fix controller compatibility with Foreman 1.7
 
+## v3.2.1
+* fix empty? error when generating full host image on Ruby 1.8/1.9 (#7812,
+  Ronald van Zantvoort)
+
 ## v3.2.0
 * add full host image containing OS bootloader for hosts that fail to
   chainload with isolinux and iPXE (#7046)

data/README.md

@@ -133,12 +133,6 @@ 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 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:
 
@@ -146,6 +140,13 @@ plugin and run:
 
 See the hammer_cli_foreman_bootdisk documentation for more advanced usage.
 
+To generate from the command line on the Foreman server:
+
+    foreman-rake bootdisk:generate:host NAME=foo.example.com OUTPUT=/tmp
+
+Set `OUTPUT=/path` to change the output destination path (directory or file).
+It must be writable by the 'foreman' user.
+
 ### Per-host full images
 
 A variant of the per-host image, this version doesn't chainload from Foreman,
@@ -159,12 +160,6 @@ To generate the image from the web interface, view the host page, click the
 a while to generate, as it downloads the OS bootloaders which can be
 considerable in size.
 
-To generate from the command line on the Foreman server:
-
-    foreman-rake bootdisk:generate:full_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:
 
@@ -172,6 +167,13 @@ plugin and run:
 
 See the hammer_cli_foreman_bootdisk documentation for more advanced usage.
 
+To generate from the command line on the Foreman server:
+
+    foreman-rake bootdisk:generate:full_host NAME=foo.example.com
+
+Set `OUTPUT=/path` to change the output destination path (directory or file).
+It must be writable by the 'foreman' user.
+
 ### Generic image
 
 This provides a single ISO that can be used by all registered hosts, but since
@@ -186,12 +188,6 @@ 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 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:
 
@@ -199,6 +195,13 @@ plugin and run:
 
 See the hammer_cli_foreman_bootdisk documentation for more advanced usage.
 
+To generate from the command line on the Foreman server:
+
+    foreman-rake bootdisk:generate:generic
+
+Set `OUTPUT=/path` to change the output destination path (directory or file).
+It must be writable by the 'foreman' user.
+
 ### Host group images
 
 TODO

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -1,11 +1,13 @@
 require 'net/http'
+require 'tempfile'
+require 'tmpdir'
 require 'uri'
 
 # Generates an iPXE ISO hybrid image
 #
 # requires syslinux, ipxe/ipxe-bootimgs, genisoimage, isohybrid
 class ForemanBootdisk::ISOGenerator
-  def self.generate_full_host(host, &block)
+  def self.generate_full_host(host, opts = {}, &block)
     raise ::Foreman::Exception.new(N_('Host is not in build mode, so the template cannot be rendered')) unless host.build?
 
     tmpl = host.send(:generate_pxe_template)
@@ -26,7 +28,7 @@ class ForemanBootdisk::ISOGenerator
       end
     end
 
-    generate({ :isolinux => tmpl, :files => files }, &block)
+    generate(opts.merge(:isolinux => tmpl, :files => files), &block)
   end
 
   def self.generate(opts = {}, &block)
@@ -66,7 +68,11 @@ class ForemanBootdisk::ISOGenerator
         end if opts[:files].respond_to? :each
       end
 
-      iso = File.join(wd, 'output.iso')
+      iso = if opts[:dir]
+              Tempfile.new(['bootdisk', '.iso'], opts[:dir]).path
+            else
+              File.join(wd, 'output.iso')
+            end
       unless system("#{Setting[:bootdisk_mkiso_command]} -o #{iso} -iso-level 2 -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table #{File.join(wd, 'build')}")
         raise ::Foreman::Exception.new(N_("ISO build failed"))
       end
@@ -105,7 +111,7 @@ class ForemanBootdisk::ISOGenerator
         write_cache = use_cache
         uri = URI(uri)
         Net::HTTP.start(uri.host, uri.port) do |http|
-          request = Net::HTTP::Get.new uri
+          request = Net::HTTP::Get.new uri.request_uri
 
           http.request request do |response|
             response.read_body do |chunk|

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/lib/tasks/bootdisk.rake

@@ -1,15 +1,26 @@
 require 'date'
+require 'tmpdir'
 
 namespace :bootdisk do
+  def outputdir
+    if ENV['OUTPUT']
+      File.directory?(ENV['OUTPUT']) ? ENV['OUTPUT'] : File.dirname(ENV['OUTPUT'])
+    elsif File.writable?(Dir.pwd)
+      Dir.pwd
+    else
+      Dir.tmpdir
+    end
+  end
+
   namespace :generate do
     desc 'Generate a static boot disk for a specific host.  NAME=fqdn, OUTPUT path'
     task :host => :environment do
       host = Host::Base.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
       tmpl = host.bootdisk_template_render
 
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |image|
-        output = ENV['OUTPUT'] || "#{host.name}.iso"
-        FileUtils.cp image, output
+      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+        output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}.iso")
+        FileUtils.mv image, output
         puts "Wrote #{output}"
       end
     end
@@ -17,8 +28,8 @@ namespace :bootdisk do
     desc 'Generate a full boot disk for a specific host with the OS bootloader included.  NAME=fqdn, OUTPUT path'
     task :full_host => :environment do
       host = Host::Base.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
-      ForemanBootdisk::ISOGenerator.generate_full_host(host) do |image|
-        output = ENV['OUTPUT'] || "#{host.name}_#{Date.today.strftime('%Y%m%d')}.iso"
+      ForemanBootdisk::ISOGenerator.generate_full_host(host, :dir => outputdir) do |image|
+        output = ENV['OUTPUT'] || File.join(outputdir, "#{host.name}_#{Date.today.strftime('%Y%m%d')}.iso")
         FileUtils.cp image, output
         puts "Wrote #{output}"
       end
@@ -28,8 +39,8 @@ namespace :bootdisk do
     task :generic => :environment do
       tmpl = ForemanBootdisk::Renderer.new.generic_template_render
 
-      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |image|
-        output = ENV['OUTPUT'] || "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
+      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl, :dir => outputdir) do |image|
+        output = ENV['OUTPUT'] || File.join(outputdir, "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso")
         FileUtils.cp image, output
         puts "Wrote #{output}"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-11-17 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.
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman