foreman_discovery 14.0.1 → 15.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6db307d435a16f1400f797101433c496b54191570025be1c57dd99b17f6de642
-  data.tar.gz: 3448174f47cda0c77c34f10224f7331f3f4abc472bcf0bda4648477ebff4e373
+  metadata.gz: 305477b201b75199eef688c2bea65f1a514d556b106315c2fd0f654584e70a29
+  data.tar.gz: c5326ee72b7fea7a727eae0307b9c10242b0ff9f9cc24ff75dfc4ca7fd914a89
 SHA512:
-  metadata.gz: 1cb57bb7847aba12ba8210621b6300768780e917c30d36c9fa0d20e5c4f5f2047d4e2c3fe55548c576447e66057def3c258adc5755c373d4a644f23313bb1add
-  data.tar.gz: 2a24c9feea20b333a350fab9ef535e0adc83d5e9d499198298ca44d6417a312c280e53cad885c986cc9aab5917246bce1815f65bef94deeb3fdf91f2734554dd
+  metadata.gz: 806df7387b0d27b0ff717a9e882f8ab235585bce379b8fbe1e009936b9663b87e4a19d9211c5cc8beea1ddce5f97469ab6ebaeac81d6886a6479a92e31454dfc
+  data.tar.gz: 88b1b13517df83ce74a27d07a38e946db6330182f37a4e4ab98dec82afcd34a3704ffa1c4868e8d87c07b601232dd3ebc950ab3098d9c589ee0080e3e867abfa

data/README.md

@@ -22,11 +22,15 @@ see the [API README](README.api.md)
 We use [RedMine instance](http://projects.theforeman.org/projects/discovery/issues)
 instead of github.com issues. Please report issues there.
 
-## Grace Note: Testing
+## Testing
 
-If you only wish to test the plugin code itself, you don't need to create the PXE boot
-image above, or have a TFTP server to run it from. Simply POST a hash of Host Facts to
-`/api/v2/discovered_hosts/facts` to create a Discovered Host in the UI.
+There are unit and integration tests in the repository, to run them execute the following in the *Foreman core* directory:
+
+	bundle exec rake test:discovery
+
+It is possible to execute a single test, however the path must be *absolute* (e.g. use `$HOME` variable):
+
+	bundle exec rake test:discovery TEST=~/work/foreman_discovery/test/unit/host_discovered_test.rb
 
 # Copyright
 

data/app/controllers/api/v2/discovery_rules_controller.rb

@@ -36,8 +36,8 @@ module Api
           param :max_count, Integer, :desc => N_("enables to limit maximum amount of provisioned hosts per rule")
           param :priority, Integer, :desc => N_("puts the rules in order, low numbers go first. Must be greater then zero")
           param :enabled, :bool, :desc => N_("flag is used for temporary shutdown of rules")
-          param :location_ids, Array, :required => true, :desc => N_("location ID for provisioned hosts") if SETTINGS[:locations_enabled]
-          param :organization_ids, Array, :required => true, :desc => N_("organization ID for provisioned hosts") if SETTINGS[:organizations_enabled]
+          param :location_ids, Array, :required => true, :desc => N_("location ID for provisioned hosts")
+          param :organization_ids, Array, :required => true, :desc => N_("organization ID for provisioned hosts")
         end
       end
 

data/app/controllers/concerns/foreman/controller/discovered_extensions.rb

@@ -33,12 +33,8 @@ module Foreman::Controller::DiscoveredExtensions
   end
 
   def validate_rule_by_taxonomy rule, host
-    if SETTINGS[:organizations_enabled]
-      return false unless rule.organizations.include?(host.organization)
-    end
-    if SETTINGS[:locations_enabled]
-      return false unless rule.locations.include?(host.location)
-    end
+    return false unless rule.organizations.include?(host.organization)
+    return false unless rule.locations.include?(host.location)
     true
   end
 

data/app/controllers/discovered_hosts_controller.rb

@@ -318,14 +318,10 @@ class DiscoveredHostsController < ::ApplicationController
       @location = @host.location
     end
 
-    if SETTINGS[:organizations_enabled]
-      @organization ||= Organization.current
-      @organization ||= Organization.my_organizations.first
-    end
-    if SETTINGS[:locations_enabled]
-      @location ||= Location.current
-      @location ||= Location.my_locations.first
-    end
+    @organization ||= Organization.current
+    @organization ||= Organization.my_organizations.first
+    @location ||= Location.current
+    @location ||= Location.my_locations.first
   end
 
   # particular actions will always raise N+1 queries

data/app/helpers/discovered_hosts_helper.rb

@@ -28,13 +28,13 @@ module DiscoveredHostsHelper
   def multiple_discovered_hosts_actions_select
     actions = [[_('Auto Provision'), multiple_auto_provision_discovered_hosts_path, hash_for_multiple_auto_provision_discovered_hosts_path]]
     actions <<  [_('Reboot'), multiple_reboot_discovered_hosts_path, hash_for_multiple_reboot_discovered_hosts_path]
-    actions <<  [_('Assign Organization'), select_multiple_organization_discovered_hosts_path,  hash_for_select_multiple_organization_discovered_hosts_path] if SETTINGS[:organizations_enabled]
-    actions <<  [_('Assign Location'), select_multiple_location_discovered_hosts_path,  hash_for_select_multiple_location_discovered_hosts_path] if SETTINGS[:locations_enabled]
+    actions <<  [_('Assign Organization'), select_multiple_organization_discovered_hosts_path,  hash_for_select_multiple_organization_discovered_hosts_path]
+    actions <<  [_('Assign Location'), select_multiple_location_discovered_hosts_path,  hash_for_select_multiple_location_discovered_hosts_path]
     actions <<  [_('Delete'), multiple_destroy_discovered_hosts_path, hash_for_multiple_destroy_discovered_hosts_path]
 
     select_action_button( _("Select Action"), {:id => 'submit_multiple'},
       actions.map do |action|
-        link_to_function(action[0], "build_modal(this, '#{action[1]}')", :'data-dialog-title' => _("%s - The following hosts are about to be changed") % action[0]) if authorized_for(action[2])
+        link_to_function(action[0], "tfm.hosts.table.buildModal(this, '#{action[1]}')", :'data-dialog-title' => _("%s - The following hosts are about to be changed") % action[0]) if authorized_for(action[2])
       end.flatten
     )
   end

data/app/helpers/discovery_rules_helper.rb

@@ -26,10 +26,10 @@ module DiscoveryRulesHelper
     actions = [display_link_if_authorized(_('Discovered Hosts'), hash_for_discovered_hosts_path.merge(:search => rule.search))]
     actions << display_link_if_authorized(_('Associated Hosts'), hash_for_hosts_path.merge(:search => "discovery_rule = \"#{rule.name}\""))
     if rule.enabled?
-      actions << display_link_if_authorized(_('Disable'), hash_for_disable_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :confirm => _("Disable rule '%s'?") % rule)
+      actions << display_link_if_authorized(_('Disable'), hash_for_disable_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :data => { :confirm => _("Disable rule '%s'?") % rule })
     else
-      actions << display_link_if_authorized(_('Enable'), hash_for_enable_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :confirm => _("Enable rule '%s'?") % rule)
+      actions << display_link_if_authorized(_('Enable'), hash_for_enable_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :data => { :confirm => _("Enable rule '%s'?") % rule })
     end
-    actions << display_delete_if_authorized(hash_for_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :confirm => _("Delete rule '%s'?") % rule)
+    actions << display_delete_if_authorized(hash_for_discovery_rule_path(:id => rule).merge(:auth_object => rule, :authorizer => authorizer), :data => { :confirm => _("Delete rule '%s'?") % rule })
   end
 end

data/app/models/discovery_rule.rb

@@ -25,10 +25,10 @@ class DiscoveryRule < ApplicationRecord
   has_many :hosts, :dependent => :nullify
 
   scoped_search :on => :name, :complete_value => :true
-  scoped_search :on => :priority
-  scoped_search :on => :search
+  scoped_search :on => :priority, :only_explicit => true
+  scoped_search :on => :search, :only_explicit => true
   scoped_search :on => :enabled
-  scoped_search :relation => :hostgroup, :on => :name, :complete_value => true, :rename => :hostgroup
+  scoped_search :relation => :hostgroup, :on => :name, :complete_value => true, :rename => :hostgroup, :only_explicit => true
 
   default_scope lambda {
     with_taxonomy_scope do
@@ -47,17 +47,13 @@ class DiscoveryRule < ApplicationRecord
 
   def enforce_taxonomy
     return if hostgroup.nil?
-    if SETTINGS[:organizations_enabled]
-      unless (ms = hostgroup.organizations - organizations).empty?
-        names = ms.collect(&:name).to_sentence
-        errors.add(:organizations, n_("Host group organization %s must also be associated to the discovery rule", "Host group organizations %s must also be associated to the discovery rule", ms.size) % names)
-      end
+    unless (ms = hostgroup.organizations - organizations).empty?
+      names = ms.collect(&:name).to_sentence
+      errors.add(:organizations, n_("Host group organization %s must also be associated to the discovery rule", "Host group organizations %s must also be associated to the discovery rule", ms.size) % names)
     end
-    if SETTINGS[:locations_enabled]
-      unless (ms = hostgroup.locations - locations).empty?
-        names = ms.collect(&:name).to_sentence
-        errors.add(:locations, n_("Host group location %s must also be associated to the discovery rule", "Host group locations %s must also be associated to the discovery rule", ms.size) % names)
-      end
+    unless (ms = hostgroup.locations - locations).empty?
+      names = ms.collect(&:name).to_sentence
+      errors.add(:locations, n_("Host group location %s must also be associated to the discovery rule", "Host group locations %s must also be associated to the discovery rule", ms.size) % names)
     end
   end
 end

data/app/models/host/discovered.rb

@@ -20,16 +20,12 @@ class Host::Discovered < ::Host::Base
   scoped_search :on => :last_report, :complete_value => true, :only_explicit => true
   scoped_search :relation => :primary_interface, :on => :ip, :complete_value => true
   scoped_search :relation => :primary_interface, :on => :mac, :complete_value => true
-  scoped_search :relation => :model, :on => :name, :complete_value => true, :rename => :model
+  scoped_search :relation => :model, :on => :name, :complete_value => true, :rename => :model, :only_explicit => true
   scoped_search :relation => :fact_values, :on => :value, :in_key => :fact_names, :on_key => :name, :rename => :facts, :complete_value => true, :only_explicit => true
-  if SETTINGS[:locations_enabled]
-    scoped_search :relation => :location, :on => :name, :rename => :location, :complete_value => true, :only_explicit => true
-    scoped_search :on => :location_id, :complete_value => false, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
-  end
-  if SETTINGS[:organizations_enabled]
-    scoped_search :relation => :organization, :on => :name, :rename => :organization, :complete_value => true, :only_explicit => true
-    scoped_search :on => :organization_id, :complete_value => false, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
-  end
+  scoped_search :relation => :location, :on => :name, :rename => :location, :complete_value => true, :only_explicit => true
+  scoped_search :on => :location_id, :complete_value => false, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+  scoped_search :relation => :organization, :on => :name, :rename => :organization, :complete_value => true, :only_explicit => true
+  scoped_search :on => :organization_id, :complete_value => false, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
   scoped_search :relation => :subnet, :on => :network, :complete_value => true, :rename => :subnet
   scoped_search :relation => :subnet, :on => :name, :complete_value => true, :rename => 'subnet.name'
   scoped_search :relation => :discovery_attribute_set, :on => :cpu_count, :rename => :cpu_count, :complete_value => true, :only_explicit => true
@@ -208,7 +204,7 @@ class Host::Discovered < ::Host::Base
   end
 
   def notification_recipients_ids
-    org_recipients = find_organization_users if Taxonomy.organizations_enabled
+    org_recipients = find_organization_users
     org_recipients ||= []
 
     admins = User.unscoped.only_admin.except_hidden.

data/app/models/host/managed_extensions.rb

@@ -8,7 +8,7 @@ module Host::ManagedExtensions
 
     belongs_to :discovery_rule
 
-    scoped_search :relation => :discovery_rule, :on => :name, :rename => :discovery_rule, :complete_value => true
+    scoped_search :relation => :discovery_rule, :on => :name, :rename => :discovery_rule, :complete_value => true, :only_explicit => true
   end
 
   def queue_reboot
@@ -45,9 +45,7 @@ module Host::ManagedExtensions
     template = provisioning_template(:kind => 'kexec')
     raise ::Foreman::Exception.new(N_("Kexec template not associated with operating system")) unless template
 
-    source = Foreman::Renderer::Source::String.new(name: template.name, content: template.template)
-    scope = Foreman::Renderer.get_scope(host: self, source: source)
-    json = JSON.parse(Foreman::Renderer.render(source, scope))
+    json = JSON.parse(render_template(template: template))
     ::Foreman::Exception.new(N_("Kernel kexec URL is invalid: '%s'"), json['kernel']) unless json['kernel'] =~ /\Ahttp.+\Z/
     ::Foreman::Exception.new(N_("Init RAM kexec URL is invalid: '%s'"), json['initrd']) unless json['initrd'] =~ /\Ahttp.+\Z/
     json
@@ -70,12 +68,14 @@ module Host::ManagedExtensions
 
   def delete_discovery_attribute_set
     return if new_record?
-    DiscoveryAttributeSet.where(:host_id => self.id).destroy_all if saved_change_to_attribute?(:type)
+
+    DiscoveryAttributeSet.where(:host_id => self.id).destroy_all if saved_change_to_attribute?(:type) && type_previously_changed?
   end
 
   def update_notifications
     return if new_record?
-    return unless saved_change_to_attribute?(:type)
+    return unless saved_change_to_attribute?(:type) || type_previously_changed?
+
     ForemanDiscovery::UINotifications::DestroyHost.deliver!(self)
   end
 end

data/app/models/setting/discovered.rb

@@ -16,6 +16,8 @@ class Setting::Discovered < ::Setting
 
     Setting.transaction do
       [
+        self.set('discovery_location', N_("The default location to place discovered hosts in"), "", N_("Discovery location"), nil, { :collection => Proc.new {Hash[Location.all.map{|loc| [loc[:title], loc[:title]]}]} }),
+        self.set('discovery_organization', N_("The default organization to place discovered hosts in"), "", N_("Discovery organization"), nil, { :collection => Proc.new {Hash[Organization.all.map{|org| [org[:title], org[:title]]}]} }),
         self.set('discovery_fact', N_("Fact name to use for primary interface detection"), "discovery_bootif", N_("Interface fact")),
         self.set('discovery_auto_bond', N_("Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"), false, N_("Create bond interfaces")),
         self.set('discovery_clean_facts', N_("Clean all reported facts during provisioning (except discovery facts)"), false, N_("Clean all facts")),
@@ -40,22 +42,6 @@ class Setting::Discovered < ::Setting
       ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
     end
 
-    if SETTINGS[:locations_enabled]
-      Setting.transaction do
-        [
-          self.set('discovery_location', N_("The default location to place discovered hosts in"), "", N_("Discovery location"), nil, { :collection => Proc.new {Hash[Location.all.map{|loc| [loc[:title], loc[:title]]}]} }),
-        ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
-      end
-    end
-
-    if SETTINGS[:organizations_enabled]
-      Setting.transaction do
-        [
-          self.set('discovery_organization', N_("The default organization to place discovered hosts in"), "", N_("Discovery organization"), nil, { :collection => Proc.new {Hash[Organization.all.map{|org| [org[:title], org[:title]]}]} }),
-        ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
-      end
-    end
-
     true
   end
 

data/app/services/foreman_discovery/import_hooks/subnet_and_taxonomy.rb

@@ -34,26 +34,26 @@ module ForemanDiscovery
       end
 
       def set_location
-        return unless SETTINGS[:locations_enabled]
         host.location = suggested_location
         logger.info "Assigned location: #{host.location}"
       end
 
       def suggested_location
-        Location.find_by_title(facts["foreman_location"] || facts["discovery_location"]) ||
+        logger.warn("Do not use 'foreman_location' fact for discovery and use 'discovery_location' instead") if facts["foreman_location"]
+        Location.find_by_title(facts["discovery_location"]) ||
           Location.find_by_title(Setting[:discovery_location]) ||
           host.subnet.try(:locations).try(:first) ||
           Location.first
       end
 
       def set_organization
-        return unless SETTINGS[:organizations_enabled]
         host.organization = suggested_organization
         logger.info "Assigned organization: #{host.organization}"
       end
 
       def suggested_organization
-        Organization.find_by_title(facts["foreman_organization"] || facts["discovery_organization"]) ||
+        logger.warn("Do not use 'foreman_organization' fact for discovery and use 'discovery_organization' instead") if facts["foreman_organization"]
+        Organization.find_by_title(facts["discovery_organization"]) ||
           Organization.find_by_title(Setting[:discovery_organization]) ||
           host.subnet.try(:organizations).try(:first) ||
           Organization.first

data/app/views/api/v2/discovered_hosts/main.json.rabl

@@ -9,10 +9,5 @@ node :subnet_name do |host|
   host.subnet.to_label if host.subnet.present?
 end
 
-if SETTINGS[:organizations_enabled]
-  attributes :organization_id, :organization_name
-end
-
-if SETTINGS[:locations_enabled]
-  attributes :location_id, :location_name
-end
+attributes :organization_id, :organization_name
+attributes :location_id, :location_name

data/app/views/api/v2/discovery_rules/main.json.rabl

@@ -9,14 +9,10 @@ child :hosts do
   extends "api/v2/discovered_hosts/base"
 end
 
-if SETTINGS[:organizations_enabled]
-  child :organizations => :organizations do
-    attributes :id, :name
-  end
+child :organizations => :organizations do
+  attributes :id, :name
 end
 
-if SETTINGS[:locations_enabled]
-  child :locations => :locations do
-    attributes :id, :name
-  end
+child :locations => :locations do
+  attributes :id, :name
 end

data/app/views/discovered_hosts/_discovered_hosts_list.html.erb

@@ -1,8 +1,7 @@
-<%= javascript "host_checkbox" %>
 <% title _('Discovered Hosts') %>
 <table class="<%= table_css_classes('table-condensed') %>" >
   <tr>
-    <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
+    <th class="ca"><%= check_box_tag "check_all", "", false, { :onclick => "tfm.hosts.table.toggleCheck()", :'check-title' => _("Select all items in this page"), :'uncheck-title'=> _("items selected. Uncheck to Clear") } %></th>
     <th class=''><%= sort :name, :as => _('Name') %></th>
     <th class="hidden-tablet hidden-xs"><%= sort :model, :as => _('Model') %></th>
     <th class="hidden-tablet hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
@@ -13,12 +12,8 @@
     <% Setting::Discovered.discovery_fact_column_array.each do |fact_column| %>
       <th class="hidden-tablet hidden-xs"><%= fact_column.capitalize %></th>
     <% end %>
-    <% if SETTINGS[:locations_enabled] -%>
-      <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>
-    <% end -%>
-    <% if SETTINGS[:organizations_enabled] -%>
-      <th class="hidden-tablet hidden-xs"><%= sort :organization, :as => _('Organization') %></th>
-    <% end -%>
+    <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>
+    <th class="hidden-tablet hidden-xs"><%= sort :organization, :as => _('Organization') %></th>
     <th class="hidden-tablet hidden-xs"><%= sort :subnet, :as => _("Subnet") %></th>
     <th class="hidden-tablet hidden-xs"><%= sort :last_report, :as => _("Last Facts Upload") %></th>
     <th class="hidden-tablet hidden-xs"><%= _("Actions") %></th>
@@ -26,15 +21,11 @@
   <% @hosts.each do |host| -%>
     <tr>
       <td class="ca">
-        <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized_for_edit_destroy?, :class => 'host_select_boxes', :onclick => 'hostChecked(this)' -%>
+        <%= check_box_tag "host_ids[]", nil, false, :id => "host_ids_#{host.id}", :disabled => !authorized_for_edit_destroy?, :class => 'host_select_boxes', :onclick => 'tfm.hosts.table.hostChecked(this)' -%>
       </td>
       <%= render :partial => "discovered_host", :locals => {:host => host} %>
-      <% if SETTINGS[:locations_enabled] -%>
-        <td class="hidden-tablet hidden-xs"><%= host.location.try(:title) %></td>
-      <% end -%>
-      <% if SETTINGS[:organizations_enabled] -%>
-        <td class="hidden-tablet hidden-xs"><%= host.organization.try(:title) %></td>
-      <% end -%>
+      <td class="hidden-tablet hidden-xs"><%= host.location.try(:title) %></td>
+      <td class="hidden-tablet hidden-xs"><%= host.organization.try(:title) %></td>
       <td class="hidden-tablet hidden-xs"><%= host.primary_interface.try(:subnet).try(:to_label) %></td>
       <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
       <td>
@@ -46,7 +37,7 @@
           display_link_if_authorized(_("Auto Provision"), hash_for_auto_provision_discovered_host_path(:id => host), :method => :post),
           display_link_if_authorized(_("Refresh facts"), hash_for_refresh_facts_discovered_host_path(:id => host)),
           display_link_if_authorized(_("Reboot"), hash_for_reboot_discovered_host_path(:id => host), :method => :put),
-          display_delete_if_authorized(hash_for_discovered_host_path(:id => host), :confirm => _("Delete %s?") % host.name, :action => :destroy))%>
+          display_delete_if_authorized(hash_for_discovered_host_path(:id => host), :data => { :confirm => _("Delete %s?") % host.name }, :action => :destroy)) %>
         </td>
       </tr>
     <% end -%>
@@ -64,7 +55,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal"><%= _('Cancel') %></button>
-        <button type="button" class="btn btn-primary" onclick="submit_modal_form()"><%= _('Submit') %></button>
+        <button type="button" class="btn btn-primary" onclick="tfm.hosts.table.submitModalForm()"><%= _('Submit') %></button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->

data/app/views/discovered_hosts/_selected_hosts.html.erb

@@ -6,12 +6,8 @@
         <tr>
           <th><%= _('Name') %></th>
           <th><%= _('Model') %></th>
-          <% if SETTINGS[:locations_enabled] %>
-            <th><%= _('Location') %></th>
-          <% end %>
-          <% if SETTINGS[:organizations_enabled] %>
-            <th><%= _('Organization') %></th>
-          <% end %>
+          <th><%= _('Location') %></th>
+          <th><%= _('Organization') %></th>
         </tr>
       </thead>
       <tbody>
@@ -19,12 +15,8 @@
           <tr>
             <td><%=h host %> </td>
             <td><%=h host.model %> </td>
-            <% if SETTINGS[:locations_enabled]%>
             <td><%=h host.try(:location) %></td>
-            <% end %>
-            <% if SETTINGS[:organizations_enabled]%>
             <td><%=h host.try(:organization) %></td>
-            <% end %>
           </tr>
         <% end -%>
       </tbody>

data/app/views/discovered_hosts/multiple_destroy.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag submit_multiple_destroy_discovered_hosts_path(:host_ids => params[:host_ids]), :onsubmit => "resetSelection()" do -%>
+<%= form_tag submit_multiple_destroy_discovered_hosts_path(:host_ids => params[:host_ids]), :onsubmit => "tfm.hosts.table.resetSelection()" do -%>
   <%= alert :class => 'alert-warning',
   :text => _("This might take a while, as all hosts, facts and reports will be destroyed as well"),
   :header => '' %>

data/app/views/discovered_hosts/select_multiple_location.html.erb

@@ -3,7 +3,7 @@
   <div class="col-md-8">
     <%= form_for :location, :url => update_multiple_location_discovered_hosts_path(:host_ids => params[:host_ids]) do |f| %>
       <%= f.select :id, Location.all.map{|e| [e.name, e.id]},{:include_blank => _("Select location")},
-                   :onchange => "toggle_multiple_ok_button(this)" %>
+                   :onchange => "tfm.hosts.table.toggleMultipleOkButton (this)" %>
       <%= f.hidden_field :optimistic_import, :value => "yes" %>
     <% end %>
   </div>

data/app/views/discovered_hosts/select_multiple_organization.html.erb

@@ -3,7 +3,7 @@
   <div class="col-md-8">
     <%= form_for :organization, :url => update_multiple_organization_discovered_hosts_path(:host_ids => params[:host_ids]) do |f| %>
       <%= f.select :id, Organization.all.map{|e| [e.name, e.id]},{:include_blank => _("Select organization")},
-                   :onchange => "toggle_multiple_ok_button(this)" %>
+                   :onchange => "tfm.hosts.table.toggleMultipleOkButton (this)" %>
       <%= f.hidden_field :optimistic_import, :value => "yes" %>
     <% end %>
   </div>

data/app/views/foreman_discovery/debian_kexec.erb

@@ -24,7 +24,7 @@ Please read kexec(8) man page for more information about semantics.
   mask = @host.facts['discovery_netmask']
   gw = @host.facts['discovery_gateway']
   dns = @host.facts['discovery_dns']
-  options = ["nomodeset", "auto=true"]
+  options = ["nomodeset", "nokaslr", "auto=true"]
   options << @host.facts['append']
   options << "domain=#{@host.domain}"
   options << 'console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA keyboard-configuration/layoutcode=us localechooser/translation/warn-light=true localechooser/translation/warn-severe=true'