foreman_bootdisk 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada1629fb10bac22102cbd9eefade4131d825734
-  data.tar.gz: d3c3d123abc34f9d80b7aabb533a413402787820
+  metadata.gz: 3dbe2e8426146b25ce78dea249b33ba9f35293b1
+  data.tar.gz: 0741b50ad7795889f4f694687c25fef87f1c39fa
 SHA512:
-  metadata.gz: 85bf056ee2b9ffafb0ab4ac605a65a9c5e9e400e9f920c93f66c270a949ed3d7f47fca3322e3d9ffa21a48cf62e6141a94210f20edc155dd93c0a5fe925d13da
-  data.tar.gz: d8e071b412f3db4636a7379154f408864149e3019e34b084f066ccb0115e2e0eda3c8d0e21fa99f3c15012c444c4c0b04a279c288281acfaaf5e15366a8246e5
+  metadata.gz: c8c7dd29e0e76766b8408a1611bf5c7a5d18d54adb7fa4961929f8d642418a853b271c85d2b3c2db69179f053c4b29ddad10aae05a8b5dd3f4cd5f8c42653e2b
+  data.tar.gz: 99eabe8b84e51cb47ca8a7503a2d2663c92d6a27ea7409116ed3594c5a1f0cc62165d8d01d98275c43d4e81cff30992214e32ccaf7f99f259bbd411446122734

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.0.4
+* fix Foreman 1.5 host show page compatibility
+* updates to README
+
 ## v2.0.3
 * fix Foreman 1.5 auth system compatibility (#4893)
 * fix filename of generic ISO image in rake task

data/README.md

@@ -42,13 +42,9 @@ gPXE images are unsupported due to lack of initrd support.
 
 ## Configuration
 
-Some configuration is set 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_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
-* `bootdisk_mkiso_command` is the name of genisoimage/mkisofs on your OS
+With all image types, hosts have to be registered to Foreman prior to booting
+the image.  Hosts will be identified by their MAC or IP address to provide
+the correct provisioning template if the host is in build mode.
 
 For per-host images, ensure host IP addresses and subnets are populated, and
 the subnet's gateway, subnet mask and DNS resolver(s) are correctly configured
@@ -57,11 +53,7 @@ under Infrastructure>Subnets in Foreman.
 To permit access to images for non-admin users, add the "Boot disk access" role
 to a user or the "download_bootdisk" permission to an existing role.
 
-### Templates
-
-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.
+## Templates
 
 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
@@ -70,14 +62,45 @@ 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:
+Standard templates for the kickstart/preseed and optionally finish script
+still need to be associated, as bootdisk only handles bootstrapping.
+
+* EL clones or Fedora should use "Kickstart default" as the "provision"
+  template
+* RHEL should use "Kickstart RHEL default" as the "provision" template
+* Preseed (Debian/Ubuntu) OSes, use "Preseed default" as the
+  "provision" template and "Preseed default finish" as the "finish" template
+
+If you're not using Foreman's default kickstart or preseed provisioning
+templates, then ensure your versions 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 and preseed files are ready to use.
 
+### Customising boot disk templates
+
+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
+
+These templates are baked into the downloaded ISO files and generally don't
+need to be modified.
+
+## Settings
+
+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
+
 ## Available images
 
 The image types have trade-offs, but are all meant for environments without
@@ -126,10 +149,10 @@ Optionally set `OUTPUT=/path/foo.iso` to change the output destination.
 
 ### Generic image
 
-This provides a single ISO that can be used by all hosts, but since IP details
-can't be stored inside, it requires a DHCP pool on the network to bootstrap.
-It will boot and contact Foreman for template of a registered host matching a
-MAC address or the IP the host was assigned by DHCP.
+This provides a single ISO that can be used by all registered hosts, but since
+IP details can't be stored inside, it requires a DHCP pool on the network to
+bootstrap.  It will boot and contact Foreman for template of a registered host
+matching a MAC address or the IP the host was assigned by DHCP.
 
 The installation can continue on either the DHCP or static IP depending on how
 the OS iPXE template is configured, and could configure the assigned IP

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

@@ -5,7 +5,7 @@ module Bootdisk::HostsHelperExt
     alias_method_chain :host_title_actions, :bootdisk
   end
 
-  def host_title_actions_with_bootdisk(host, vm)
+  def host_title_actions_with_bootdisk(*args)
     title_actions(
       button_group(
         select_action_button(_('Boot disk'), {},
@@ -14,7 +14,7 @@ module Bootdisk::HostsHelperExt
         )
       )
     )
-    host_title_actions_without_bootdisk(host, vm)
+    host_title_actions_without_bootdisk(*args)
   end
 
 end

data/lib/bootdisk/version.rb

@@ -1,3 +1,3 @@
 module Bootdisk
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-09 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.