foreman_bootdisk 7.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fa4ade5bfd81ecd392c0d54a2e86e4e7940ea07
-  data.tar.gz: a473a7b359b679b62fb24c7eb0e3664e349e15f5
+  metadata.gz: fc62297d4d1bc9080a8e9aebe25d02eb185ab357
+  data.tar.gz: f09c9610aae17af4185be4577f671ac4546ad669
 SHA512:
-  metadata.gz: 7fe4aff48600235205c953564df151641e0582cb8fc7cac7c30e783f3691c6f7a630ad49daa9f740bb1550496119d3d04373dc0468008ab253fba3632a288efa
-  data.tar.gz: 5ac55cb0066f4c5ecf475e6e838af5ec8a2eef04fed4cbcb3e8a6992675cd73515004ea7807279fdf800937d200abde5515a023a59b40c35c81408c3231c6927
+  metadata.gz: 61fa71708a3cdd5ee6152197c4cbd8a13011c4c733c821a453e6d9320677463820c624f57224c65d3ec43cd258167ac68cb8bda3829d0d0093fea3fc527bbbd0
+  data.tar.gz: a8415772ff0aa0ead2e4e5cb6baead0931c315ab131203cb7917df33e290c60fd0f9eaedfd4f93d9a3254ebe7007bf4a923e26fd150e2e5c539da855f15aac8a

data/CHANGES.md

@@ -1,8 +1,7 @@
 # Changelog
 
-## v7.0.1
-* added extra information during iPXE boot (#14794)
-* show bootdisk fields after new host page reload (#14796)
+## v8.0.0
+* fix button and compute resource loading compatibility with Foreman 1.12
 
 ## v7.0.0
 * add automated "bootdisk" provisioning method when creating hosts on VMware

data/README.md

@@ -42,6 +42,7 @@ gPXE images are unsupported due to lack of initrd support.
 | >= 1.8          | ~> 5.0         |
 | >= 1.9          | ~> 6.0         |
 | >= 1.11         | >= 6.1, < 8.0  |
+| >= 1.12         | ~> 8.0         |
 
 # Usage
 

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

@@ -5,9 +5,3 @@ 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/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -8,14 +8,14 @@ module ForemanBootdisk::HostsHelperExt
   def host_title_actions_with_bootdisk(*args)
     title_actions(
       button_group(
-        select_action_button(_('Boot disk'), {},
-          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(_("Full host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'full_host', :id => @host}, :class=>'btn'),
+        select_action_button(_('Boot disk'), {:class => 'btn btn-group'},
+          display_bootdisk_link_if_authorized(_("Host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'host', :id => @host}, :class=>'la'),
+          display_bootdisk_link_if_authorized(_("Full host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'full_host', :id => @host}, :class=>'la'),
           content_tag(:li, "", :class => "divider"),
-          display_bootdisk_link_if_authorized(_("Generic image"), {:controller => 'foreman_bootdisk/disks', :action => 'generic'}, :class=>'btn'),
+          display_bootdisk_link_if_authorized(_("Generic image"), {:controller => 'foreman_bootdisk/disks', :action => 'generic'}, :class=>'la'),
           display_bootdisk_for_subnet,
           content_tag(:li, "", :class => "divider"),
-          display_bootdisk_link_if_authorized(_("Help"), {:controller => 'foreman_bootdisk/disks', :action => 'help'}, :class=>'btn')
+          display_bootdisk_link_if_authorized(_("Help"), {:controller => 'foreman_bootdisk/disks', :action => 'help'}, :class=>'la')
         )
       )
     )
@@ -25,7 +25,7 @@ module ForemanBootdisk::HostsHelperExt
   # need to wrap this one in a test for template proxy presence
   def display_bootdisk_for_subnet
     if (proxy = @host.try(:subnet).try(:tftp)) && proxy.has_feature?('Templates')
-      display_bootdisk_link_if_authorized(_("Subnet '%s' generic image") % @host.subnet.name, {:controller => 'foreman_bootdisk/disks', :action => 'subnet', :id => @host}, :class=>'btn')
+      display_bootdisk_link_if_authorized(_("Subnet '%s' generic image") % @host.subnet.name, {:controller => 'foreman_bootdisk/disks', :action => 'subnet', :id => @host}, :class=>'la')
     else
       ""
     end

data/app/views/foreman_bootdisk/generic_host.erb

@@ -9,8 +9,6 @@
 #
 # 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,29 +14,26 @@ 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 <%= interface.ip %>
+echo Configuring net${idx} for static IP address
 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/engine.rb

@@ -48,7 +48,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.11'
+        requires_foreman '>= 1.12'
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :subnet, :help],
@@ -75,7 +75,7 @@ module ForemanBootdisk
         Host::Managed.send(:include, ForemanBootdisk::Orchestration::Compute) if SETTINGS[:unattended]
         HostsHelper.send(:include, ForemanBootdisk::HostsHelperExt)
         UnattendedController.send(:include, ForemanBootdisk::UnattendedControllerExt)
-        Foreman::Model::Vmware.send(:include, ForemanBootdisk::ComputeResources::Vmware) if SETTINGS[:vmware]
+        Foreman::Model::Vmware.send(:include, ForemanBootdisk::ComputeResources::Vmware) if Foreman::Model::Vmware.available?
       rescue => e
         puts "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"
       end

data/lib/foreman_bootdisk/version.rb

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

data/lib/tasks/bootdisk.rake

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

metadata

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