foreman_bootdisk 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4cae342fdce305a1ef37aa490220f5f688696ba
-  data.tar.gz: 95527d0b5e50214b9a4f5e29c2e1fd8b68cdf5ea
+  metadata.gz: 6fa4ade5bfd81ecd392c0d54a2e86e4e7940ea07
+  data.tar.gz: a473a7b359b679b62fb24c7eb0e3664e349e15f5
 SHA512:
-  metadata.gz: 7c68354a0657bfa35aac430090ffa22a4be8bd6b847eb293628e6f5abcf9303df840dfb118228bb2312d7494f3903c5f1181872aff3beefd77ed466c525095ab
-  data.tar.gz: a3bd89f2fcd364027362562446d1b17b058d7ebd3d8bd7be32ebcc8c9976fdc2be3c07672258e7008c373e21903621e4dc13e25a82c03cdbd361f75cc2972d36
+  metadata.gz: 7fe4aff48600235205c953564df151641e0582cb8fc7cac7c30e783f3691c6f7a630ad49daa9f740bb1550496119d3d04373dc0468008ab253fba3632a288efa
+  data.tar.gz: 5ac55cb0066f4c5ecf475e6e838af5ec8a2eef04fed4cbcb3e8a6992675cd73515004ea7807279fdf800937d200abde5515a023a59b40c35c81408c3231c6927

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v7.0.1
+* added extra information during iPXE boot (#14794)
+* show bootdisk fields after new host page reload (#14796)
+
 ## v7.0.0
 * add automated "bootdisk" provisioning method when creating hosts on VMware
   compute resources, attaching a host ISO image to the virtual CDROM (#3287)

data/app/assets/javascripts/foreman_bootdisk/host_edit.js

@@ -5,3 +5,9 @@ function bootdisk_provision_method_selected() {
   $('#image_selection select').attr('disabled', true);
 }
 $(document).on('change', '#host_provision_method_bootdisk', bootdisk_provision_method_selected);
+
+$(document).on('ContentLoad', function() {
+  if($('#host_provision_method_bootdisk').is(':checked')) {
+    bootdisk_provision_method_selected();
+  }
+});

data/app/views/foreman_bootdisk/generic_host.erb

@@ -9,6 +9,8 @@
 #
 # Copy this template to customize it, the original is read-only.
 
+echo Foreman Bootdisk: Generic image
+
 # loop over net* until we can get a template
 <% url = bootdisk_chain_url %>
 <% (0..32).each do |i| -%>

data/app/views/foreman_bootdisk/host.erb

@@ -14,26 +14,29 @@ bootdisk_raise(N_('Subnet (%s) has no gateway defined'), interface.subnet) if in
 bootdisk_raise(N_('Subnet (%s) has no primary DNS server defined'), interface.subnet) if interface.subnet.dns_primary.nil? || interface.subnet.dns_primary.empty?
 %>
 
+echo Foreman Bootdisk: Host image (<%= @host.name %>)
+
 # loop over net* until the host's MAC matches
 <% (0..32).each do |i| -%>
 :net<%= i %>
 isset ${net<%= i -%>/mac} || goto no_nic
 echo net<%= i -%> is a ${net<%= i -%>/chip} with MAC ${net<%= i -%>/mac}
 iseq ${net<%= i -%>/mac} <%= interface.mac -%> || goto net<%= i+1 %>
-ifopen net<%= i %>
 set idx:int32 <%= i %>
 goto loop_success
 <% end -%>
 
 :loop_success
-echo Configuring net${idx} for static IP address
+echo Configuring net${idx} for static IP address <%= interface.ip %>
 ifopen net${idx}
 set netX/ip <%= interface.ip %>
 set netX/netmask <%= interface.subnet.mask %>
 set netX/gateway <%= interface.subnet.gateway %>
+ifstat net${idx}
 route
 
 # Note, iPXE can only use one DNS server
+echo Using DNS <%= interface.subnet.dns_primary %>
 set dns <%= interface.subnet.dns_primary %>
 set domain <%= interface.domain.to_s %>
 

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '7.0.0'
+  VERSION = '7.0.1'
 end

data/lib/tasks/bootdisk.rake

@@ -71,13 +71,9 @@ namespace :test do
   end
 end
 
-Rake::Task[:test].enhance do
-  Rake::Task['test:foreman_bootdisk'].invoke
-end
+Rake::Task[:test].enhance ['test:foreman_bootdisk']
 
 load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance do
-    Rake::Task['test:foreman_bootdisk'].invoke
-  end
+  Rake::Task["jenkins:unit"].enhance ['test:foreman_bootdisk']
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-05-16 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.