foreman_discovery 15.1.0 → 16.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 279682fd72f6cdf11166d4feb018e13f7fbe17137a23186507178000a387aeb0
-  data.tar.gz: 2d2fb544411f4db3594f0cd46ddc2a89afe216a12fdbdff769fc39e63e78879d
+  metadata.gz: 40c64a4f3c756e207293b6e5be67190294b9c4f2ab5054e08edd8d085718556f
+  data.tar.gz: b22ef9bf418ac18e94170429e7368cb1c6f94b9b0d2290b60341a9415e908b01
 SHA512:
-  metadata.gz: 5ffd16f5840e43beed5ae06306292569d445027b4a0a48a547cf16e9e3f8e8eba9ccb94796cbe20d723b478c02e5fa0a0b2667f1fa8417b1a0520575cd8f121a
-  data.tar.gz: 1e7defe44767c8dc6d2716d7a5eec5a30b57ef24008cf4a10ec3e6e88bc766b8fcd7a147d44d9ccd032a5ace60f981e6fd9502217760b30746c336b9bf84486f
+  metadata.gz: d9f9013fa2d04e883da3c0c8c42b5a6e3552093323698359b8e9b70179f0284ccf35d633eac5720cc03fa79678af915b5eda3c7508be775b0836128ef6d738d8
+  data.tar.gz: 688c8d68c1a87aff1fda0a00eef057daf0c35a06ce007746e568763e868c82ee718d15a51d1124cb9dc1a47498ec94bc7f33e62d986ba7ed23e3eb6babfd140f

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

@@ -41,6 +41,8 @@ module Foreman::Controller::DiscoveredExtensions
   # trigger the provisioning
   def perform_auto_provision original_host, rule
     raise(::Foreman::Exception.new(N_("No hostgroup associated with rule '%s'"), rule)) if rule.hostgroup.nil?
+
+    logger.debug "Auto-provisioning via rule #{rule} hostgroup #{rule.hostgroup} subnet #{rule.hostgroup.subnet}"
     host = ::ForemanDiscovery::HostConverter.to_managed(original_host)
     host.hostgroup_id = rule.hostgroup_id
     host.comment = "Auto-discovered and provisioned via rule '#{rule.name}'"
@@ -55,6 +57,8 @@ module Foreman::Controller::DiscoveredExtensions
     # explicitly set all inheritable attributes from hostgroup
     host.attributes = host.apply_inherited_attributes(hostgroup_id: rule.hostgroup_id)
     host.set_hostgroup_defaults
+    # change subnet and fetch unused IPs
+    ::ForemanDiscovery::HostConverter.unused_ip_for_host(host, rule.hostgroup.subnet, rule.hostgroup.subnet6)
     # save! does not work here
     if host.save
       host

data/app/controllers/discovered_hosts_controller.rb

@@ -78,6 +78,7 @@ class DiscoveredHostsController < ::ApplicationController
   def perform_update(host, success_message = nil)
     Taxonomy.no_taxonomy_scope do
       ::ForemanDiscovery::HostConverter.set_build_clean_facts(host)
+      ::ForemanDiscovery::HostConverter.unused_ip_for_host(host)
       if host.save
         success_options = { :success_redirect => host_path(host), :redirect_xhr => request.xhr? }
         success_options[:success_msg] = success_message if success_message

data/app/models/setting/discovered.rb

@@ -10,39 +10,32 @@ class Setting::Discovered < ::Setting
   BLANK_ATTRS << 'discovery_facts_ipmi'
   BLANK_ATTRS << 'discovery_prefix'
 
-  def self.load_defaults
-    # Check the table exists
-    return unless super
-
-    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")),
-        self.set('discovery_hostname', N_("List of facts to use for the hostname (separated by comma, first wins)"), "discovery_bootif", N_("Hostname facts")),
-        self.set('discovery_auto', N_("Automatically provision newly discovered hosts, according to the provisioning rules"), false, N_("Auto provisioning")),
-        self.set('discovery_reboot', N_("Automatically reboot or kexec discovered host during provisioning"), true, N_("Reboot")),
-        self.set('discovery_prefix', N_("The default prefix to use for the host name, must start with a letter"), "mac", N_("Hostname prefix")),
-        self.set('discovery_fact_column', N_("Extra facter columns to show in host lists (separate by comma)"), "", N_("Fact columns")),
-        self.set('discovery_facts_highlights', N_("Regex to organize facts for highlights section - e.g. ^(abc|cde)$"), "", N_("Highlighted facts")),
-        self.set('discovery_facts_storage', N_("Regex to organize facts for storage section"), "", N_("Storage facts")),
-        self.set('discovery_facts_software', N_("Regex to organize facts for software section"), "", N_("Software facts")),
-        self.set('discovery_facts_hardware', N_("Regex to organize facts for hardware section"), "", N_("Hardware facts")),
-        self.set('discovery_facts_network', N_("Regex to organize facts for network section"), "", N_("Network facts")),
-        self.set('discovery_facts_ipmi', N_("Regex to organize facts for ipmi section"), "", N_("IPMI facts")),
-        self.set('discovery_lock', N_("Automatically generate PXE configuration to pin a newly discovered host to discovery"), false, N_("Lock PXE")),
-        self.set('discovery_pxelinux_lock_template', N_("PXELinux template to be used when pinning a host to discovery"), 'pxelinux_discovery', N_("Locked PXELinux template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
-        self.set('discovery_pxegrub_lock_template', N_("PXEGrub template to be used when pinning a host to discovery"), 'pxegrub_discovery', N_("Locked PXEGrub template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
-        self.set('discovery_pxegrub2_lock_template', N_("PXEGrub2 template to be used when pinning a host to discovery"), 'pxegrub2_discovery', N_("Locked PXEGrub2 template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
-        self.set('discovery_always_rebuild_dns', N_("Force DNS entries creation when provisioning discovered host"), true, N_("Force DNS")),
-        self.set('discovery_error_on_existing', N_("Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"), false, N_("Error on existing NIC")),
-        self.set('discovery_naming', N_("Discovery hostname naming pattern"), 'Fact', N_("Type of name generator"), nil, {:collection => Proc.new {::Host::Discovered::NAMING_PATTERNS} }),
-      ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
-    end
-
-    true
+  def self.default_settings
+    [
+      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")),
+      self.set('discovery_hostname', N_("List of facts to use for the hostname (separated by comma, first wins)"), "discovery_bootif", N_("Hostname facts")),
+      self.set('discovery_auto', N_("Automatically provision newly discovered hosts, according to the provisioning rules"), false, N_("Auto provisioning")),
+      self.set('discovery_reboot', N_("Automatically reboot or kexec discovered host during provisioning"), true, N_("Reboot")),
+      self.set('discovery_prefix', N_("The default prefix to use for the host name, must start with a letter"), "mac", N_("Hostname prefix")),
+      self.set('discovery_fact_column', N_("Extra facter columns to show in host lists (separate by comma)"), "", N_("Fact columns")),
+      self.set('discovery_facts_highlights', N_("Regex to organize facts for highlights section - e.g. ^(abc|cde)$"), "", N_("Highlighted facts")),
+      self.set('discovery_facts_storage', N_("Regex to organize facts for storage section"), "", N_("Storage facts")),
+      self.set('discovery_facts_software', N_("Regex to organize facts for software section"), "", N_("Software facts")),
+      self.set('discovery_facts_hardware', N_("Regex to organize facts for hardware section"), "", N_("Hardware facts")),
+      self.set('discovery_facts_network', N_("Regex to organize facts for network section"), "", N_("Network facts")),
+      self.set('discovery_facts_ipmi', N_("Regex to organize facts for ipmi section"), "", N_("IPMI facts")),
+      self.set('discovery_lock', N_("Automatically generate PXE configuration to pin a newly discovered host to discovery"), false, N_("Lock PXE")),
+      self.set('discovery_pxelinux_lock_template', N_("PXELinux template to be used when pinning a host to discovery"), 'pxelinux_discovery', N_("Locked PXELinux template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
+      self.set('discovery_pxegrub_lock_template', N_("PXEGrub template to be used when pinning a host to discovery"), 'pxegrub_discovery', N_("Locked PXEGrub template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
+      self.set('discovery_pxegrub2_lock_template', N_("PXEGrub2 template to be used when pinning a host to discovery"), 'pxegrub2_discovery', N_("Locked PXEGrub2 template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
+      self.set('discovery_always_rebuild_dns', N_("Force DNS entries creation when provisioning discovered host"), true, N_("Force DNS")),
+      self.set('discovery_error_on_existing', N_("Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"), false, N_("Error on existing NIC")),
+      self.set('discovery_naming', N_("Discovery hostname naming pattern"), 'Fact', N_("Type of name generator"), nil, {:collection => Proc.new {::Host::Discovered::NAMING_PATTERNS} }),
+    ]
   end
 
   def self.discovery_fact_column_array

data/app/services/foreman_discovery/fact_parser.rb

@@ -6,7 +6,7 @@ module ForemanDiscovery
       raise(::Foreman::Exception.new(N_("Discovered host '%{host}' has all NICs filtered out, filter: %{filter}") %
         {:host => host, :filter => Setting[:ignored_interface_identifiers]})) if interfaces.size == 0
       bootif_mac = FacterUtils::bootif_mac(facts).try(:downcase)
-      detected = interfaces.detect { |_, values| values[:macaddress].try(:downcase) == bootif_mac && values[:ipaddress].present? }
+      detected = interfaces.detect { |_, values| values[:macaddress].try(:downcase) == bootif_mac && (values[:ipaddress].present? || values[:ipaddress6].present?) }
       Rails.logger.debug "Discovery fact parser detected primary interface: #{detected}"
       # return the detected interface as array [name, facts]
       detected || raise(::Foreman::Exception.new(N_("Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}") %

data/app/services/foreman_discovery/host_converter.rb

@@ -1,5 +1,4 @@
 class ForemanDiscovery::HostConverter
-
   # Converts discovered host to managed host without uptading the database.
   # Record must be saved explicitly (using save! or update_attributes! or similar).
   # Creates shallow copy.
@@ -35,4 +34,33 @@ class ForemanDiscovery::HostConverter
     host.build = true
   end
 
+  def self.unused_ip_for_subnet(subnet, mac, existing_ip)
+    ipam = subnet.unused_ip(mac)
+    raise(::Foreman::Exception.new(N_("IPAM must be configured for subnet '%s'"), subnet)) unless ipam.present?
+
+    # None IPAM returns nil - in that case keep the current address
+    suggested_ip = ipam.suggest_ip
+    suggested_ip.nil? ? existing_ip : suggested_ip
+  end
+
+  def self.unused_ip_for_host(host, new_subnet = nil, new_subnet6 = nil)
+    host.interfaces.each do |interface|
+      next unless interface.managed?
+
+      interface.subnet = new_subnet if new_subnet
+      interface.subnet6 = new_subnet6 if new_subnet6
+      interface.ip = unused_ip_for_subnet(interface.subnet, interface.mac, interface.ip) if interface.subnet
+      interface.ip6 = unused_ip_for_subnet(interface.subnet6, interface.mac, interface.ip6) if interface.subnet6
+      interface.save!
+    end
+  end
+
+  def self.change_subnet_and_unused_ip(host, hostgroup)
+    if host.subnet != hostgroup.subnet || host.subnet6 != hostgroup.subnet6
+      Rails.logger.debug "Discovered host subnets #{[host.subnet, host.subnet6]} do not match hostgroup subnets #{[hostgroup.subnet, hostgroup.subnet6]}"
+      unused_ip_for_host(host, host.hostgroup.subnet, host.hostgroup.subnet6)
+    else
+      Rails.logger.debug "Discovered host subnets #{[host.subnet, host.subnet6]} match hostgroup subnets"
+    end
+  end
 end

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

@@ -4,14 +4,15 @@ module ForemanDiscovery
     class SubnetAndTaxonomy < ImportHook
       def after_populate
         primary_ip = host.primary_interface.ip
+        primary_ip6 = host.primary_interface.ip6
 
-        unless primary_ip
+        unless primary_ip || primary_ip6
           logger.warn "Unable to assign subnet - reboot trigger may not be possible, primary interface is missing IP address"
           return
         end
 
         # set subnet
-        set_subnet(primary_ip)
+        set_subnets(primary_ip, primary_ip6)
         # set location and organization
         set_location
         set_organization
@@ -19,18 +20,9 @@ module ForemanDiscovery
 
       private
 
-      def set_subnet(ip)
-        host.primary_interface.subnet = suggested_subnet(ip)
-      end
-
-      def suggested_subnet(ip)
-        subnet = Subnet.subnet_for(ip)
-        if subnet
-          logger.info "Detected subnet: #{subnet} with taxonomy #{subnet.organizations.collect(&:name)}/#{subnet.locations.collect(&:name)}"
-        else
-          logger.warn "Subnet could not be detected for #{ip}"
-        end
-        subnet
+      def set_subnets(ip, ip6)
+        host.primary_interface.subnet = ForemanDiscovery::SubnetSuggestion.for(ip: ip, kind: 'IPv4') if ip
+        host.primary_interface.subnet6 = ForemanDiscovery::SubnetSuggestion.for(ip: ip6, kind: 'IPv6') if ip6
       end
 
       def set_location

data/app/services/foreman_discovery/subnet_suggestion.rb

@@ -0,0 +1,26 @@
+module ForemanDiscovery
+  class SubnetSuggestion
+    attr_accessor :ip, :kind
+
+    def self.for(ip:, kind:)
+      new(ip: ip, kind: kind).()
+    end
+
+    def initialize(ip:, kind:)
+      self.ip = ip
+      self.kind = kind
+    end
+
+    def call
+      return unless ip
+
+      subnet = Subnet.unscoped.subnet_for(ip)
+      if subnet
+        Rails.logger.info "Detected #{kind} subnet: #{subnet} with taxonomy #{subnet.organizations.collect(&:name)}/#{subnet.locations.collect(&:name)}"
+      else
+        Rails.logger.info "#{kind} subnet could not be detected for #{ip}"
+      end
+      subnet
+    end
+  end
+end

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

@@ -17,6 +17,8 @@
           <% if show_location_tab? %>
             <%= select_f f, :location_id, Location.my_locations, :id, :to_label, {}, {:size => 'col-md-10'} %>
           <% end %>
+
+          <div>Changing the Host's Subnet is not possible via Customize Host form, use Create Host or Auto provisioning and set the desired Subnet in the Hostgroup.</div>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>

data/config/routes.rb

@@ -6,6 +6,8 @@ Rails.application.routes.draw do
   post 'os_selected_discovered_hosts'           => 'hosts#os_selected'
   post 'medium_selected_discovered_hosts'       => 'hosts#medium_selected'
 
+  get 'discovered_hosts/help', :action => :welcome, :controller => 'discovered_hosts'
+
   constraints(:id => /[^\/]+/) do
     resources :discovered_hosts, :except => [:new, :create] do
       member do

data/extra/discover-host

@@ -3,10 +3,12 @@ require 'optparse'
 require 'json'
 require 'rest-client'
 
-def find_base name="default"
-  return name if File.exists?(name)
+def find_base name = "default"
+  return name if File.exist?(name)
+
   file = File.absolute_path(File.dirname(__FILE__) + "../../test/facts/#{name}.json")
-  raise "Unable to find file #{file}" unless File.exists?(file)
+  raise "Unable to find file #{file}" unless File.exist?(file)
+
   file
 end
 
@@ -14,6 +16,7 @@ base = find_base
 version = "3.4.0"
 interfaces = []
 preserve_interfaces = false
+use_facts_endpoint = false
 primary = nil
 bootif = nil
 url = "http://admin:changeme@localhost:3000"
@@ -38,6 +41,10 @@ OptionParser.new do |opts|
     preserve_interfaces = true
   end
 
+  opts.on("-a", "--facts", "Use host facts endpoint") do |v|
+    use_facts_endpoint = true
+  end
+
   opts.on("-pNAME", "--primary=NAME", "Interface to use as primary (defaults to the first one)") do |v|
     primary = v
   end
@@ -70,8 +77,8 @@ unless preserve_interfaces
   json["interfaces"] = interfaces.map{|i| i.first}.join(',')
   interfaces.each do |iface|
     name, subnet, ipo, mac = iface
-    mac = (["52"] + 5.times.map { '%02x' % rand(0..255) }).join(':') unless mac
-    ipo = rand(1..253) unless ipo
+    mac ||= (["52"] + 5.times.map { '%02x' % rand(0..255) }).join(':')
+    ipo ||= rand(1..253)
     ip = "192.168.#{subnet}.#{ipo}"
     json["macaddress_#{name}"] = mac
     json["ipaddress_#{name}"] = ip
@@ -83,7 +90,14 @@ unless preserve_interfaces
   end
 end
 puts JSON.pretty_generate(json)
-resource = RestClient::Resource.new(url + "/api/v2/discovered_hosts/facts", verify_ssl: OpenSSL::SSL::VERIFY_NONE)
-response = resource.post({"facts" => json}.to_json, {content_type: :json, accept: :json})
+if use_facts_endpoint
+  endpoint = url + "/api/v2/hosts/facts"
+  payload = {"facts" => json, "name" => json["hostname"] || json["networking"]["fqdn"]}
+else
+  endpoint = url + "/api/v2/discovered_hosts/facts"
+  payload = {"facts" => json}
+end
+resource = RestClient::Resource.new(endpoint, verify_ssl: OpenSSL::SSL::VERIFY_NONE)
+response = resource.post(payload.to_json, {content_type: :json, accept: :json})
 puts response.code
 puts response.body

data/lib/foreman_discovery/engine.rb

@@ -43,12 +43,12 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 1.22.0'
+        requires_foreman '>= 1.24.0'
 
         # discovered hosts permissions
         security_block :discovery do
           permission :view_discovered_hosts, {
-            :discovered_hosts          => [:index, :show, :auto_complete_search],
+            :discovered_hosts          => [:index, :show, :auto_complete_search, :welcome],
             :"api/v2/discovered_hosts" => [:index, :show]
           }, :resource_type => 'Host'
           permission :submit_discovered_hosts, {

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "15.1.0"
+  VERSION = "16.0.0"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -7,10 +7,10 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 15.0.0\n"
+"Project-Id-Version: foreman_discovery 15.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-13 15:39+0200\n"
-"PO-Revision-Date: 2019-04-18 19:36+0000\n"
+"POT-Creation-Date: 2019-10-22 11:55+0200\n"
+"PO-Revision-Date: 2019-10-22 20:43+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -99,7 +99,7 @@ msgid "Execute rules against a discovered host"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:122
-#: ../app/controllers/discovered_hosts_controller.rb:159
+#: ../app/controllers/discovered_hosts_controller.rb:160
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
@@ -108,7 +108,7 @@ msgid "Unable to provision %{host}: %{errors}"
 msgstr "No es pot aprovisionar a %{host}: %{errors}"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:131
-#: ../app/controllers/discovered_hosts_controller.rb:166
+#: ../app/controllers/discovered_hosts_controller.rb:167
 msgid "No rule found for host %s"
 msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 
@@ -117,12 +117,12 @@ msgid "Execute rules against all currently discovered hosts"
 msgstr "Executa les regles contra tots els amfitrions detectats actualment"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:142
-#: ../app/controllers/discovered_hosts_controller.rb:172
+#: ../app/controllers/discovered_hosts_controller.rb:173
 msgid "Errors during auto provisioning: %s"
 msgstr "Erros durant l'auto aprovisionament: %s"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:145
-#: ../app/controllers/discovered_hosts_controller.rb:175
+#: ../app/controllers/discovered_hosts_controller.rb:176
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -143,7 +143,7 @@ msgid "Rebooting all discovered hosts"
 msgstr "S'estan reiniciant tots els amfitrions descoberts"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:207
-#: ../app/controllers/discovered_hosts_controller.rb:128
+#: ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -217,11 +217,11 @@ msgstr ""
 msgid "No hostgroup associated with rule '%s'"
 msgstr ""
 
-#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:69
+#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:73
 msgid "Errors during reboot: %s"
 msgstr "Errors durant el reinici: %s"
 
-#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:87
+#: ../app/controllers/concerns/foreman/controller/discovered_extensions.rb:91
 msgid "No discovered hosts to reboot"
 msgstr ""
 
@@ -229,91 +229,91 @@ msgstr ""
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:96
+#: ../app/controllers/discovered_hosts_controller.rb:97
 msgid "Facts refreshed for %s"
 msgstr "Els objectes d'interès que s'han refrescat per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:98
+#: ../app/controllers/discovered_hosts_controller.rb:99
 msgid "Failed to refresh facts for %s"
 msgstr "No s'ha pogut refrescar els objectes d'interès per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:101
+#: ../app/controllers/discovered_hosts_controller.rb:102
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:108
+#: ../app/controllers/discovered_hosts_controller.rb:109
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:112
+#: ../app/controllers/discovered_hosts_controller.rb:113
 msgid "Rebooting host %s"
 msgstr "S'està reiniciant l'amfitrió %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:114
+#: ../app/controllers/discovered_hosts_controller.rb:115
 msgid "Failed to reboot host %s"
 msgstr "No s'ha pogut reiniciar l'amfitrió %s."
 
-#: ../app/controllers/discovered_hosts_controller.rb:117
+#: ../app/controllers/discovered_hosts_controller.rb:118
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:131
+#: ../app/controllers/discovered_hosts_controller.rb:132
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:149
+#: ../app/controllers/discovered_hosts_controller.rb:150
 msgid "Destroyed selected hosts"
 msgstr "S'han destruït els amfitrions seleccionats"
 
-#: ../app/controllers/discovered_hosts_controller.rb:151
+#: ../app/controllers/discovered_hosts_controller.rb:152
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:163
+#: ../app/controllers/discovered_hosts_controller.rb:164
 msgid "Failed to auto provision host %s: %s"
 msgstr "No s'ha pogut auto aprovisionar l'amfitrió %s: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:191
+#: ../app/controllers/discovered_hosts_controller.rb:192
 msgid "Discovered hosts are provisioning now"
 msgstr "Els amfitrions descoberts ara tenen aprovisionament"
 
-#: ../app/controllers/discovered_hosts_controller.rb:223
+#: ../app/controllers/discovered_hosts_controller.rb:224
 msgid "Highlights"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:223
+#: ../app/controllers/discovered_hosts_controller.rb:224
 msgid "Storage"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:223
+#: ../app/controllers/discovered_hosts_controller.rb:224
 msgid "Hardware"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:223
+#: ../app/controllers/discovered_hosts_controller.rb:224
 msgid "Network"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:223
+#: ../app/controllers/discovered_hosts_controller.rb:224
 msgid "Software"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:223
+#: ../app/controllers/discovered_hosts_controller.rb:224
 msgid "IPMI"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:223
+#: ../app/controllers/discovered_hosts_controller.rb:224
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:301
+#: ../app/controllers/discovered_hosts_controller.rb:302
 msgid "No hosts were found with that id or name"
 msgstr "No s'ha trobat cap amfitrió amb aquest ID o nom"
 
-#: ../app/controllers/discovered_hosts_controller.rb:305
+#: ../app/controllers/discovered_hosts_controller.rb:306
 msgid "No hosts selected"
 msgstr "Cap amfitrió seleccionat"
 
-#: ../app/controllers/discovered_hosts_controller.rb:311
+#: ../app/controllers/discovered_hosts_controller.rb:312
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
 
@@ -342,7 +342,7 @@ msgstr "Refresca els objectes d'interès"
 
 #: ../app/helpers/discovered_hosts_helper.rb:16
 #: ../app/helpers/discovered_hosts_helper.rb:30
-#: ../app/models/setting/discovered.rb:26
+#: ../app/models/setting/discovered.rb:22
 #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
 msgid "Reboot"
 msgstr "Reinicia"
@@ -466,51 +466,51 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/models/host/discovered.rb:41
+#: ../app/models/host/discovered.rb:40
 msgid "Fact + prefix"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:42
+#: ../app/models/host/discovered.rb:41
 msgid "Random name"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:43
+#: ../app/models/host/discovered.rb:42
 msgid "MAC-based name"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:52
+#: ../app/models/host/discovered.rb:51
 msgid "Invalid facts, must be a Hash"
 msgstr "Objectes d'interès no vàlids, han de tenir un Hash"
 
-#: ../app/models/host/discovered.rb:57
+#: ../app/models/host/discovered.rb:56
 msgid ""
 "Expected discovery_fact '%s' is missing, unable to detect primary interface "
 "and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:70
+#: ../app/models/host/discovered.rb:69
 msgid ""
 "Invalid facts: hash does not contain a valid value for any of the facts in "
 "the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:96
+#: ../app/models/host/discovered.rb:95
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:151
+#: ../app/models/host/discovered.rb:150
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "No s'han pogut obtenir els objectes d'interès del servidor intermediari %{url}: %{error}"
 
-#: ../app/models/host/discovered.rb:159
+#: ../app/models/host/discovered.rb:158
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr "No es pot reiniciar %{name} a través de %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:167
+#: ../app/models/host/discovered.rb:166
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "No es pot realitzar kexec a %{name} a través de %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:186
+#: ../app/models/host/discovered.rb:185
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -538,191 +538,191 @@ msgstr ""
 msgid "Rebuild DNS for %s"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:19
+#: ../app/models/setting/discovered.rb:15
 msgid "The default location to place discovered hosts in"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:19
+#: ../app/models/setting/discovered.rb:15
 msgid "Discovery location"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:20
+#: ../app/models/setting/discovered.rb:16
 msgid "The default organization to place discovered hosts in"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:20
+#: ../app/models/setting/discovered.rb:16
 msgid "Discovery organization"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:21
+#: ../app/models/setting/discovered.rb:17
 msgid "Fact name to use for primary interface detection"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:21
+#: ../app/models/setting/discovered.rb:17
 msgid "Interface fact"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:22
+#: ../app/models/setting/discovered.rb:18
 msgid ""
 "Automatic bond interface (if another interface is detected on the same VLAN "
 "via LLDP)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:22
+#: ../app/models/setting/discovered.rb:18
 msgid "Create bond interfaces"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:19
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:19
 msgid "Clean all facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:24
+#: ../app/models/setting/discovered.rb:20
 msgid "List of facts to use for the hostname (separated by comma, first wins)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:24
+#: ../app/models/setting/discovered.rb:20
 msgid "Hostname facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:21
 msgid ""
 "Automatically provision newly discovered hosts, according to the "
 "provisioning rules"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:21
 msgid "Auto provisioning"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:26
+#: ../app/models/setting/discovered.rb:22
 msgid "Automatically reboot or kexec discovered host during provisioning"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:27
+#: ../app/models/setting/discovered.rb:23
 msgid "The default prefix to use for the host name, must start with a letter"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:27
+#: ../app/models/setting/discovered.rb:23
 msgid "Hostname prefix"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:28
+#: ../app/models/setting/discovered.rb:24
 msgid "Extra facter columns to show in host lists (separate by comma)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:28
+#: ../app/models/setting/discovered.rb:24
 msgid "Fact columns"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:29
+#: ../app/models/setting/discovered.rb:25
 msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:29
+#: ../app/models/setting/discovered.rb:25
 msgid "Highlighted facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:26
 msgid "Regex to organize facts for storage section"
 msgstr "Expressió regular per a organitzar els objectes d'interès per a la secció d'emmagatzematge"
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:26
 msgid "Storage facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:27
 msgid "Regex to organize facts for software section"
 msgstr "Expressió regular per a organitzar els objectes d'interès per a la secció de programari"
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:27
 msgid "Software facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:28
 msgid "Regex to organize facts for hardware section"
 msgstr "Expressió regular per a organitzar els objectes d'interès per a la secció de programari"
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:28
 msgid "Hardware facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:29
 msgid "Regex to organize facts for network section"
 msgstr "Expressió regular per a organitzar els objectes d'interès per a la secció de xarxa"
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:29
 msgid "Network facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:30
 msgid "Regex to organize facts for ipmi section"
 msgstr "Expressió regular per a organitzar els objectes d'interès per a la secció ipmi"
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:30
 msgid "IPMI facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:31
 msgid ""
 "Automatically generate PXE configuration to pin a newly discovered host to "
 "discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:31
 msgid "Lock PXE"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:36
+#: ../app/models/setting/discovered.rb:32
 msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:36
+#: ../app/models/setting/discovered.rb:32
 msgid "Locked PXELinux template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:37
+#: ../app/models/setting/discovered.rb:33
 msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:37
+#: ../app/models/setting/discovered.rb:33
 msgid "Locked PXEGrub template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:38
+#: ../app/models/setting/discovered.rb:34
 msgid "PXEGrub2 template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:38
+#: ../app/models/setting/discovered.rb:34
 msgid "Locked PXEGrub2 template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:39
+#: ../app/models/setting/discovered.rb:35
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:39
+#: ../app/models/setting/discovered.rb:35
 msgid "Force DNS"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:40
+#: ../app/models/setting/discovered.rb:36
 msgid ""
 "Do not allow to discover existing managed host matching MAC of a "
 "provisioning NIC (errors out early)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:40
+#: ../app/models/setting/discovered.rb:36
 msgid "Error on existing NIC"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:41
+#: ../app/models/setting/discovered.rb:37
 msgid "Discovery hostname naming pattern"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:41
+#: ../app/models/setting/discovered.rb:37
 msgid "Type of name generator"
 msgstr ""
 
@@ -740,6 +740,10 @@ msgid ""
 "%{filter}"
 msgstr ""
 
+#: ../app/services/foreman_discovery/host_converter.rb:39
+msgid "IPAM must be configured for subnet '%s'"
+msgstr ""
+
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
 msgid "Image API returned HTTP/%{code} with '%{body}"
 msgstr ""
@@ -778,11 +782,11 @@ msgstr "Les CPU"
 msgid "Memory"
 msgstr "Memòria"
 
-#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
+#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:25
 msgid "Customize Host"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
+#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:26
 msgid "Create Host"
 msgstr "Crea un amfitrió"
 
@@ -1092,3 +1096,19 @@ msgid ""
 "ID of Discovery Proxy to use within this subnet for managing connection to "
 "discovered hosts"
 msgstr ""
+
+#: action_names.rb:2
+msgid "Import Puppet classes"
+msgstr ""
+
+#: action_names.rb:3
+msgid "Import facts"
+msgstr ""
+
+#: action_names.rb:4
+msgid "Action with sub plans"
+msgstr ""
+
+#: action_names.rb:5
+msgid "Remote action:"
+msgstr ""