foreman_discovery 16.0.0 → 16.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40c64a4f3c756e207293b6e5be67190294b9c4f2ab5054e08edd8d085718556f
-  data.tar.gz: b22ef9bf418ac18e94170429e7368cb1c6f94b9b0d2290b60341a9415e908b01
+  metadata.gz: 93f2f0828e78292ef40c46535f34d32d616ccf00b91465a5ca103d497510de5b
+  data.tar.gz: 3f661f14112f905f9e6b4c15955ebdd8b942f5a88349ab08c6568a07b51bed5f
 SHA512:
-  metadata.gz: d9f9013fa2d04e883da3c0c8c42b5a6e3552093323698359b8e9b70179f0284ccf35d633eac5720cc03fa79678af915b5eda3c7508be775b0836128ef6d738d8
-  data.tar.gz: 688c8d68c1a87aff1fda0a00eef057daf0c35a06ce007746e568763e868c82ee718d15a51d1124cb9dc1a47498ec94bc7f33e62d986ba7ed23e3eb6babfd140f
+  metadata.gz: bbbc9c3d5fa3d24b86beecb90c7237e5ea8093331762a9667576d3472df5e7e099dcf076c0d3e277c8bc75bfc56a8ff5079dd381514e7ac4ded899bc22205e37
+  data.tar.gz: 209b24b5230750c5a428198c87405607ac925fa6bf173a45c5e593a93408d4b8a46e476f3563c93f2031b8c965bb3f3077b146283a1f87aec29df94a037c72e1

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

@@ -102,9 +102,16 @@ module Api
         state = true
         User.as_anonymous_admin do
           @discovered_host = Host::Discovered.import_host(facts)
-          Rails.logger.warn 'Discovered facts import unsuccessful, skipping auto provisioning' unless @discovered_host
-          if Setting['discovery_auto'] && @discovered_host && (rule = find_discovery_rule(@discovered_host))
-            state = perform_auto_provision(@discovered_host, rule)
+          # Host::Based.set_taxonomies sets taxonomies during import from either
+          # facts or via Global Foreman setting "default_taxonomy", reset it back so
+          # the anonymous admin can see all records. We set taxonomy explicitly via
+          # discovery SubnetAndTaxonomy import hook and enforce taxnomy manually
+          # in find_discovery_rule method via validate_rule_by_taxonomy.
+          Taxonomy.no_taxonomy_scope do
+            Rails.logger.warn 'Discovered facts import unsuccessful, skipping auto provisioning' unless @discovered_host
+            if Setting['discovery_auto'] && @discovered_host && (rule = find_discovery_rule(@discovered_host))
+              state = perform_auto_provision(@discovered_host, rule)
+            end
           end
         end
         process_response state

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

@@ -55,7 +55,7 @@ module Api
       param_group :discovery_rule, :as => :update
 
       def update
-        process_response @discovery_rule.update_attributes(discovery_rule_params)
+        process_response @discovery_rule.update(discovery_rule_params)
       end
 
       api :DELETE, "/discovery_rules/:id/", N_("Delete a rule")

data/app/controllers/discovered_hosts_controller.rb

@@ -199,15 +199,17 @@ class DiscoveredHostsController < ::ApplicationController
 
   def setup_host_class_variables
     if @host.hostgroup
+      subnet = @host.hostgroup.subnet || @host.subnet
+      subnet6 = @host.hostgroup.subnet6 || @host.subnet6
       @architecture    = @host.hostgroup.architecture
       @operatingsystem = @host.hostgroup.operatingsystem
       @environment     = @host.hostgroup.environment
       @domain          = @host.hostgroup.domain
-      @subnet          = @host.hostgroup.subnet
+      @subnet          = subnet
+      @subnet6         = subnet6
       @compute_profile = @host.hostgroup.compute_profile
       @realm           = @host.hostgroup.realm
-      @host.interfaces.first.assign_attributes(subnet: @subnet,
-                                               domain: @domain)
+      @host.interfaces.first.assign_attributes(subnet: subnet, subnet6: subnet6, domain: @domain)
       @host.environment = @environment
     end
   end

data/app/controllers/discovery_rules_controller.rb

@@ -28,7 +28,7 @@ class DiscoveryRulesController < ApplicationController
   end
 
   def update
-    if @discovery_rule.update_attributes(discovery_rule_params)
+    if @discovery_rule.update(discovery_rule_params)
       process_success
     else
       process_error

data/app/models/discovery_rule.rb

@@ -22,7 +22,7 @@ class DiscoveryRule < ApplicationRecord
   before_validation :enforce_taxonomy
 
   belongs_to :hostgroup
-  has_many :hosts, :dependent => :nullify
+  has_many_hosts :dependent => :nullify
 
   scoped_search :on => :name, :complete_value => :true
   scoped_search :on => :priority, :only_explicit => true

data/app/models/host/discovered.rb

@@ -137,12 +137,12 @@ class Host::Discovered < ::Host::Base
     subnet.present? && subnet.discovery.present?
   end
 
-  def proxy_url
-    proxied? ? subnet.discovery.url + "/discovery/#{self.ip}" : "https://#{self.ip}:8443"
+  def proxy_url(node_ip)
+    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{node_ip}:8443"
   end
 
   def refresh_facts
-    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url).facter
+    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(self.ip)).facter
     self.class.import_host facts
     import_facts facts
   rescue => e
@@ -150,20 +150,42 @@ class Host::Discovered < ::Host::Base
     raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url, :error => e)
   end
 
-  def reboot
-    resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => proxy_url)
-    resource.reboot
-  rescue => e
-    ::Foreman::Logging.exception("Unable to reboot #{name}", e)
-    raise ::Foreman::WrappedException.new(e, N_("Unable to reboot %{name} via %{url}: %{msg}"), :name => name, :url => proxy_url, :msg => e.to_s)
-  end
-
-  def kexec json
-    resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => proxy_url)
-    resource.kexec json
-  rescue => e
-    ::Foreman::Logging.exception("Unable to perform kexec on #{name}", e)
-    raise ::Foreman::WrappedException.new(e, N_("Unable to perform kexec on %{name} via %{url}: %{msg}"), :name => name, :url => proxy_url, :msg => e.to_s)
+  def reboot(old_ip = nil, new_ip = nil)
+    # perform the action against the original lease as well as the new reservation
+    ips = [old_ip, new_ip, self.ip].compact.uniq
+    logger.debug "Performing reboot calls against #{ips.to_sentence}, facts left #{facts.count}"
+    ips.each do |next_ip|
+      begin
+        node_url = proxy_url(next_ip)
+        logger.debug "Performing reboot call against #{node_url}"
+        resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
+        return true if resource.reboot
+      rescue => e
+        msg = N_("Unable to perform reboot on %{name} (%{url}): %{msg}")
+        ::Foreman::Logging.exception(msg % { :name => name, :url => node_url, :msg => e.to_s }, e)
+      end
+    end
+    msg = N_("Unable to perform %{action} on %{ips}")
+    raise ::Foreman::Exception.new(msg, action: "reboot", ips: ips.to_sentence)
+  end
+
+  def kexec(json, old_ip = nil, new_ip = nil)
+    # perform the action against the original lease as well as the new reservation
+    ips = [old_ip, new_ip, self.ip].compact.uniq
+    logger.debug "Performing kexec calls against #{ips.to_sentence}, #{facts.count} facts left"
+    ips.each do |next_ip|
+      begin
+        node_url = proxy_url(next_ip)
+        logger.debug "Performing kexec call against #{node_url}"
+        resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
+        return true if resource.kexec(json)
+      rescue => e
+        msg = N_("Unable to perform kexec on %{name} (%{url}): %{msg}")
+        ::Foreman::Logging.exception(msg % { :name => name, :url => node_url, :msg => e.to_s }, e)
+      end
+    end
+    msg = N_("Unable to perform %{action} on %{ips}")
+    raise ::Foreman::Exception.new(msg, action: "kexec", ips: ips.to_sentence)
   end
 
   def self.model_name

data/app/models/host/managed_extensions.rb

@@ -27,7 +27,7 @@ module Host::ManagedExtensions
   end
 
   def setReboot
-    old.becomes(Host::Discovered).reboot
+    old.becomes(Host::Discovered).reboot(old.ip, ip)
     # It is too late to report error in the post_queue, we catch them and
     # continue. If flash is implemented for new hosts (http://projects.theforeman.org/issues/10559)
     # we can report the error to the user perhaps.
@@ -55,7 +55,7 @@ module Host::ManagedExtensions
   end
 
   def setKexec
-    old.becomes(Host::Discovered).kexec(render_kexec_template.to_json)
+    old.becomes(Host::Discovered).kexec(render_kexec_template.to_json, old.ip, ip)
     true
   rescue ::Foreman::Exception => e
     Foreman::Logging.exception("Unable to kexec", e)

data/app/services/foreman_discovery/host_converter.rb

@@ -1,6 +1,6 @@
 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).
+  # Record must be saved explicitly (using save! or update! or similar).
   # Creates shallow copy.
   def self.to_managed(original_host, set_managed = true, set_build = true, added_attributes = {})
     host = original_host.becomes(::Host::Managed)
@@ -35,12 +35,21 @@ class ForemanDiscovery::HostConverter
   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?
+    # prefer existing reservation to prevent conflicts
+    existing_rec = subnet&.dhcp_proxy&.record(subnet.network, mac)
 
-    # None IPAM returns nil - in that case keep the current address
-    suggested_ip = ipam.suggest_ip
-    suggested_ip.nil? ? existing_ip : suggested_ip
+    if existing_rec && existing_rec.type == "reservation"
+      # reuse the reservation
+      existing_rec.ip
+    else
+      # no reservation - find new unused 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
   end
 
   def self.unused_ip_for_host(host, new_subnet = nil, new_subnet6 = nil)
@@ -51,7 +60,6 @@ class ForemanDiscovery::HostConverter
       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
 

data/app/services/foreman_discovery/node_api/node_resource.rb

@@ -6,6 +6,7 @@ module ForemanDiscovery::NodeAPI
       @args = args
       @connect_params = {
         :headers => { :accept => :json },
+        :timeout => 20, # tighter timeout, discovery performs up to two calls per request
       }
 
       if url.match(/^https/i) && Rails.env != "test"

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

@@ -17,8 +17,6 @@
           <% 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/app/views/foreman_discovery/debian_kexec.erb

@@ -28,7 +28,7 @@ Please read kexec(8) man page for more information about semantics.
   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'
-  options << "locale=#{@host.params['lang'] || 'en_US'}"
+  options << "locale=#{host_param('lang') || 'en_US'}"
   options << "inst.stage2=#{@host.operatingsystem.medium_uri(@host)}" if @host.operatingsystem.name.match(/Atomic/i)
 -%>
 {

data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb

@@ -1,7 +1,7 @@
 class RemoveOldDiscoveryReaderPermissions < ActiveRecord::Migration[4.2]
   def up
     Permission.where("name like '%_discovery_rules' and resource_type is null").each do |permission|
-      permission.update_attributes(:resource_type => 'DiscoveryRule')
+      permission.update(:resource_type => 'DiscoveryRule')
     end
   end
 

data/db/migrate/20151023144501_regenerate_red_hat_kexec.rb

@@ -1,7 +1,7 @@
 class RegenerateRedHatKexec < ActiveRecord::Migration[4.2]
   def up
     t = ProvisioningTemplate.find_by_name("Discovery Red Hat kexec")
-    t.update_attributes(:template => t.template.sub(/rescue ''$/, 'if mac')) if t
+    t.update(:template => t.template.sub(/rescue ''$/, 'if mac')) if t
   end
 
   def down

data/db/migrate/20180412124505_add_priority_score_to_discovery_rules.rb

@@ -9,7 +9,7 @@
     # and makes sure there are no two entities with the same priority.
     DiscoveryRules.reset_column_information
     DiscoveryRules.unscoped.reorder(:priority, :created_at).find_each do |rule|
-      rule.update_attributes!(:priority => score)
+      rule.update!(:priority => score)
       score += delta
     end
     change_column :discovery_rules, :priority, :integer, null: false

data/extra/discover-host

@@ -33,7 +33,7 @@ OptionParser.new do |opts|
     version = v
   end
 
-  opts.on("-iARRAY", "--interface=ARRAY", Array, "Comma separated array: name,subnet,ip,mac (can be used multiple times, default: eth0,122,7,AA:BB:CC:DD:EE:FF") do |v|
+  opts.on("-iARRAY", "--interface=ARRAY", Array, "Comma separated array: name,network/prefix,mac,ip (can be used multiple times, default: eth0,192.168.122.0/24") do |v|
     interfaces << v
   end
 
@@ -66,7 +66,7 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-interfaces << ["eth0", "122"] if interfaces.empty?
+interfaces << ["eth0", "192.168.122.0/24"] if interfaces.empty?
 primary ||= interfaces.first.first
 bootif ||= interfaces.first.first
 json = JSON.parse(File.read(base))
@@ -76,15 +76,21 @@ json["discovery_version"] = version
 unless preserve_interfaces
   json["interfaces"] = interfaces.map{|i| i.first}.join(',')
   interfaces.each do |iface|
-    name, subnet, ipo, mac = iface
+    name, subnet, mac, explicit_ip = iface
     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
+    subnet_woprefix, prefix = subnet.split('/')
+    if subnet.include?('.')
+      random_ip = IPAddr.new(subnet, Socket::AF_INET) | IPAddr.new(rand(2**prefix.to_i), Socket::AF_INET)
+      fact_name = "ipaddress"
+    else
+      random_ip = IPAddr.new(subnet, Socket::AF_INET6) | IPAddr.new(rand(2**prefix.to_i), Socket::AF_INET6)
+      fact_name = "ipaddress6"
+    end
+    json["#{fact_name}_#{name}"] = explicit_ip ? explicit_ip : random_ip
     if name == primary
-      json["macaddress"] = mac
-      json["ipaddress"] = ip
+      json["macaddress"] = json["macaddress_#{name}"]
+      json[fact_name] = json["#{fact_name}_#{name}"]
     end
     json["discovery_bootif"] = mac if name == bootif
   end

data/lib/foreman_discovery/engine.rb

@@ -148,8 +148,8 @@ module ForemanDiscovery
           :edit_discovery_rules,
           :destroy_discovery_rules,
         ]
-        role "Discovery Reader", READER
-        role "Discovery Manager", MANAGER
+        role "Discovery Reader", READER, "Role granting permissions to view discovered hosts"
+        role "Discovery Manager", MANAGER, "Role granting permissions to perform provisioning of discovered hosts"
 
         add_all_permissions_to_default_roles
 

data/lib/foreman_discovery/version.rb

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

data/locale/ca/foreman_discovery.edit.po

@@ -1,18 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the foreman_discovery package.
-# 
+#
 # Translators:
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 15.1.0\n"
+"Project-Id-Version: foreman_discovery 16.3.4\n"
 "Report-Msgid-Bugs-To: \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"
+"PO-Revision-Date: 2020-10-29 17:16+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
+"Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
+"\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,23 +23,19 @@ msgstr ""
 msgid "List all discovered hosts"
 msgstr "Llista tots els amfitrions descoberts"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:15
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:17 ../app/controllers/api/v2/discovery_rules_controller.rb:15
 msgid "filter results"
 msgstr "filtra els resultats"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:16
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:18 ../app/controllers/api/v2/discovery_rules_controller.rb:16
 msgid "sort results"
 msgstr "ordena els resultats"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:17
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:19 ../app/controllers/api/v2/discovery_rules_controller.rb:17
 msgid "paginate results"
 msgstr "pagina els resultats"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:18
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:20 ../app/controllers/api/v2/discovery_rules_controller.rb:18
 msgid "number of entries per request"
 msgstr "Nombre d'entrades per petició"
 
@@ -47,8 +43,7 @@ msgstr "Nombre d'entrades per petició"
 msgid "Show a discovered host"
 msgstr "Mostra un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:79
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:37 ../app/controllers/api/v2/discovered_hosts_controller.rb:85
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
@@ -60,6 +55,10 @@ msgstr "Crea un amfitrió descobert per a provar-ho  (utilitzeu /facts per crear
 msgid "Provision a discovered host"
 msgstr "Aprovisiona un amfitrió descobert"
 
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:54 ../app/controllers/api/v2/discovered_hosts_controller.rb:57 ../app/controllers/api/v2/discovered_hosts_controller.rb:58 ../app/controllers/api/v2/discovered_hosts_controller.rb:61 ../app/controllers/api/v2/discovered_hosts_controller.rb:64
+msgid "required if host is managed and value is not inherited from host group"
+msgstr ""
+
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
 msgid "not required if using a subnet with DHCP proxy"
 msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermediari DHCP"
@@ -68,82 +67,99 @@ msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermed
 msgid "not required if it's a virtual machine"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:76
-msgid ""
-"UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:62
+msgid "required if not imaged based provisioning and host is managed and value is not inherited from host group"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:78
-msgid ""
-"required if value is not inherited from host group or default password in "
-"settings"
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:63
+msgid "required if host is managed and custom partition has not been defined"
+msgstr "es requereix si l'amfitrió està gestionat i no s'ha definit la partició personalitzada"
+
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:69
+msgid "Host's owner type"
+msgstr "Tipus de propietari de l'amfitrió"
+
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:72
+msgid "Host's parameters (array or indexed hash)"
+msgstr ""
+
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:73
+msgid "Name of the parameter"
+msgstr "Nom del paràmetre"
+
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
+msgid "Parameter value"
+msgstr "Valor del paràmetre"
+
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:75
+msgid "Type of value"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:82
+msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
+msgstr ""
+
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:84
+msgid "required if value is not inherited from host group or default password in settings"
+msgstr ""
+
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:95
 msgid "Delete a discovered host"
 msgstr "Suprimeix un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:96
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:102
 msgid "Upload facts for a host, creating the host if required"
 msgstr "Puja els objectes d'interès per a un amfitrió, creant el nou amfitrió si fos necessari"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:97
-msgid ""
-"hash containing facts for the host with minimum set of facts: "
-"discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: "
-"eth0 (example in case primary interface is named eth0)"
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:103
+msgid "hash containing facts for the host with minimum set of facts: discovery_bootif, macaddress_eth0, ipaddress, ipaddress_eth0, interfaces: eth0 (example in case primary interface is named eth0)"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:116
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:129
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122
-#: ../app/controllers/discovered_hosts_controller.rb:160
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:135 ../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}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:125
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
 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:167
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:144 ../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"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:138
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:151
 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:173
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:155 ../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:176
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:158 ../app/controllers/discovered_hosts_controller.rb:176
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:167
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:180
 msgid "%s discovered hosts were provisioned"
 msgstr "%s amfitrions descoberts van ser aprovisionats"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:178
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:191
 msgid "Refreshing the facts of a discovered host"
 msgstr "S'estan refrescant els objectes d'interès d'un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:187
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:200
 msgid "Rebooting a discovered host"
 msgstr "S'està reiniciant un amfitrió descobert"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:196
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:209
 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:129
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:220 ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -168,8 +184,7 @@ msgid "the hostgroup that is used to auto provision a host"
 msgstr "el grup d'amfitrions que s'utilitza per a l'auto aprovisionament d'un amfitrió"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:35
-msgid ""
-"defines a pattern to assign human-readable hostnames to the matching hosts"
+msgid "defines a pattern to assign human-readable hostnames to the matching hosts"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:36
@@ -177,8 +192,7 @@ msgid "enables to limit maximum amount of provisioned hosts per rule"
 msgstr "permet la limitació del nombre total màxim dels amfitrions aprovisionats per cada regla"
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:37
-msgid ""
-"puts the rules in order, low numbers go first. Must be greater then zero"
+msgid "puts the rules in order, low numbers go first. Must be greater then zero"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovery_rules_controller.rb:38
@@ -277,51 +291,51 @@ msgstr "No s'ha pogut auto aprovisionar l'amfitrió %s: %s"
 msgid "Discovered hosts are provisioning now"
 msgstr "Els amfitrions descoberts ara tenen aprovisionament"
 
-#: ../app/controllers/discovered_hosts_controller.rb:224
+#: ../app/controllers/discovered_hosts_controller.rb:226
 msgid "Highlights"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:224
+#: ../app/controllers/discovered_hosts_controller.rb:226
 msgid "Storage"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:224
+#: ../app/controllers/discovered_hosts_controller.rb:226
 msgid "Hardware"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:224
+#: ../app/controllers/discovered_hosts_controller.rb:226
 msgid "Network"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:224
+#: ../app/controllers/discovered_hosts_controller.rb:226
 msgid "Software"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:224
+#: ../app/controllers/discovered_hosts_controller.rb:226
 msgid "IPMI"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:224
+#: ../app/controllers/discovered_hosts_controller.rb:226
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:302
+#: ../app/controllers/discovered_hosts_controller.rb:304
 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:306
+#: ../app/controllers/discovered_hosts_controller.rb:308
 msgid "No hosts selected"
 msgstr "Cap amfitrió seleccionat"
 
-#: ../app/controllers/discovered_hosts_controller.rb:312
+#: ../app/controllers/discovered_hosts_controller.rb:314
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
 
-#: ../app/controllers/discovery_rules_controller.rb:68
+#: ../app/controllers/discovery_rules_controller.rb:72
 msgid "Rule enabled"
 msgstr "Regla habilitada"
 
-#: ../app/controllers/discovery_rules_controller.rb:68
+#: ../app/controllers/discovery_rules_controller.rb:72
 msgid "Rule disabled"
 msgstr "Regla inhabilitada"
 
@@ -329,21 +343,15 @@ msgstr "Regla inhabilitada"
 msgid "%s ago"
 msgstr "fa %s"
 
-#: ../app/helpers/discovered_hosts_helper.rb:14
-#: ../app/helpers/discovered_hosts_helper.rb:29
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:37
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
 msgid "Auto Provision"
 msgstr "Auto aprovisiona"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:41
 msgid "Refresh facts"
 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:22
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:24 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:42
 msgid "Reboot"
 msgstr "Reinicia"
 
@@ -351,13 +359,11 @@ msgstr "Reinicia"
 msgid "Back"
 msgstr "Enrere"
 
-#: ../app/helpers/discovered_hosts_helper.rb:21
-#: ../app/helpers/discovered_hosts_helper.rb:35
+#: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:35
 msgid "Select Action"
 msgstr "Selecciona l'acció"
 
-#: ../app/helpers/discovered_hosts_helper.rb:23
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:43
 msgid "Delete %s?"
 msgstr "Voleu suprimir %s?"
 
@@ -377,8 +383,7 @@ msgstr "Suprimeix"
 msgid "%s - The following hosts are about to be changed"
 msgstr "%s - Els següents amfitrions estan a punt de ser canviats"
 
-#: ../app/helpers/discovered_hosts_helper.rb:46
-#: ../app/views/dashboard/_discovery_widget_host.html.erb:2
+#: ../app/helpers/discovered_hosts_helper.rb:46 ../app/views/dashboard/_discovery_widget_host.html.erb:2
 msgid "N/A"
 msgstr "N/D"
 
@@ -398,12 +403,7 @@ msgstr "Es va informar en els últims 7 dies"
 msgid "Provision"
 msgstr "Aprovisiona"
 
-#: ../app/helpers/discovery_rules_helper.rb:26
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1
-#: ../app/views/discovered_hosts/welcome.html.erb:1
-#: ../app/views/discovered_hosts/welcome.html.erb:6
-#: ../lib/foreman_discovery/engine.rb:158
-#: ../lib/foreman_discovery/engine.rb:173
+#: ../app/helpers/discovery_rules_helper.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:1 ../app/views/discovered_hosts/welcome.html.erb:8 ../lib/foreman_discovery/engine.rb:159 ../lib/foreman_discovery/engine.rb:174
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -452,17 +452,14 @@ msgid "must be present."
 msgstr ""
 
 #: ../app/models/discovery_rule.rb:52
-msgid ""
-"Host group organization %s must also be associated to the discovery rule"
-msgid_plural ""
-"Host group organizations %s must also be associated to the discovery rule"
+msgid "Host group organization %s must also be associated to the discovery rule"
+msgid_plural "Host group organizations %s must also be associated to the discovery rule"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../app/models/discovery_rule.rb:56
 msgid "Host group location %s must also be associated to the discovery rule"
-msgid_plural ""
-"Host group locations %s must also be associated to the discovery rule"
+msgid_plural "Host group locations %s must also be associated to the discovery rule"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -478,39 +475,39 @@ msgstr ""
 msgid "MAC-based name"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:51
+#: ../app/models/host/discovered.rb:55
 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:56
-msgid ""
-"Expected discovery_fact '%s' is missing, unable to detect primary interface "
-"and set hostname"
+#: ../app/models/host/discovered.rb:60
+msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../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"
+#: ../app/models/host/discovered.rb:73
+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:95
+#: ../app/models/host/discovered.rb:100
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:150
+#: ../app/models/host/discovered.rb:146
 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: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:160
+msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
+msgstr ""
+
+#: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
+msgid "Unable to perform %{action} on %{ips}"
+msgstr ""
 
-#: ../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:179
+msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
+msgstr ""
 
-#: ../app/models/host/discovered.rb:185
+#: ../app/models/host/discovered.rb:203
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -538,191 +535,183 @@ msgstr ""
 msgid "Rebuild DNS for %s"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:15
+#: ../app/models/setting/discovered.rb:17
 msgid "The default location to place discovered hosts in"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:15
+#: ../app/models/setting/discovered.rb:17
 msgid "Discovery location"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:16
+#: ../app/models/setting/discovered.rb:18
 msgid "The default organization to place discovered hosts in"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:16
+#: ../app/models/setting/discovered.rb:18
 msgid "Discovery organization"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:17
+#: ../app/models/setting/discovered.rb:19
 msgid "Fact name to use for primary interface detection"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:17
+#: ../app/models/setting/discovered.rb:19
 msgid "Interface fact"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:18
-msgid ""
-"Automatic bond interface (if another interface is detected on the same VLAN "
-"via LLDP)"
+#: ../app/models/setting/discovered.rb:20
+msgid "Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:18
+#: ../app/models/setting/discovered.rb:20
 msgid "Create bond interfaces"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:19
+#: ../app/models/setting/discovered.rb:21
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:19
+#: ../app/models/setting/discovered.rb:21
 msgid "Clean all facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:20
+#: ../app/models/setting/discovered.rb:22
 msgid "List of facts to use for the hostname (separated by comma, first wins)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:20
+#: ../app/models/setting/discovered.rb:22
 msgid "Hostname facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:21
-msgid ""
-"Automatically provision newly discovered hosts, according to the "
-"provisioning rules"
+#: ../app/models/setting/discovered.rb:23
+msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:21
+#: ../app/models/setting/discovered.rb:23
 msgid "Auto provisioning"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:22
+#: ../app/models/setting/discovered.rb:24
 msgid "Automatically reboot or kexec discovered host during provisioning"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:25
 msgid "The default prefix to use for the host name, must start with a letter"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:23
+#: ../app/models/setting/discovered.rb:25
 msgid "Hostname prefix"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:24
+#: ../app/models/setting/discovered.rb:26
 msgid "Extra facter columns to show in host lists (separate by comma)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:24
+#: ../app/models/setting/discovered.rb:26
 msgid "Fact columns"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:27
 msgid "Regex to organize facts for highlights section - e.g. ^(abc|cde)$"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:25
+#: ../app/models/setting/discovered.rb:27
 msgid "Highlighted facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:26
+#: ../app/models/setting/discovered.rb:28
 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:26
+#: ../app/models/setting/discovered.rb:28
 msgid "Storage facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:27
+#: ../app/models/setting/discovered.rb:29
 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:27
+#: ../app/models/setting/discovered.rb:29
 msgid "Software facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:28
+#: ../app/models/setting/discovered.rb:30
 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:28
+#: ../app/models/setting/discovered.rb:30
 msgid "Hardware facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:29
+#: ../app/models/setting/discovered.rb:31
 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:29
+#: ../app/models/setting/discovered.rb:31
 msgid "Network facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:32
 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:30
+#: ../app/models/setting/discovered.rb:32
 msgid "IPMI facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:31
-msgid ""
-"Automatically generate PXE configuration to pin a newly discovered host to "
-"discovery"
+#: ../app/models/setting/discovered.rb:33
+msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:33
 msgid "Lock PXE"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:34
 msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:32
+#: ../app/models/setting/discovered.rb:34
 msgid "Locked PXELinux template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:35
 msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:33
+#: ../app/models/setting/discovered.rb:35
 msgid "Locked PXEGrub template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:36
 msgid "PXEGrub2 template to be used when pinning a host to discovery"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:34
+#: ../app/models/setting/discovered.rb:36
 msgid "Locked PXEGrub2 template name"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:37
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:35
+#: ../app/models/setting/discovered.rb:37
 msgid "Force DNS"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:36
-msgid ""
-"Do not allow to discover existing managed host matching MAC of a "
-"provisioning NIC (errors out early)"
+#: ../app/models/setting/discovered.rb:38
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:36
+#: ../app/models/setting/discovered.rb:38
 msgid "Error on existing NIC"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:37
+#: ../app/models/setting/discovered.rb:39
 msgid "Discovery hostname naming pattern"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:37
+#: ../app/models/setting/discovered.rb:39
 msgid "Type of name generator"
 msgstr ""
 
@@ -735,23 +724,27 @@ msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
 msgstr ""
 
 #: ../app/services/foreman_discovery/fact_parser.rb:12
-msgid ""
-"Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: "
-"%{filter}"
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
-#: ../app/services/foreman_discovery/host_converter.rb:39
+#: ../app/services/foreman_discovery/host_converter.rb:47
 msgid "IPAM must be configured for subnet '%s'"
 msgstr ""
 
-#: ../app/services/foreman_discovery/node_api/node_resource.rb:75
+#: ../app/services/foreman_discovery/node_api/node_resource.rb:76
 msgid "Image API returned HTTP/%{code} with '%{body}"
 msgstr ""
 
-#: ../app/services/foreman_discovery/node_api/node_resource.rb:78
+#: ../app/services/foreman_discovery/node_api/node_resource.rb:79
 msgid "Image API processing error: %{msg} (HTTP/%{code}, body: %{body})"
 msgstr ""
 
+#: ../app/views/dashboard/_discovery_widget.html.erb:5
+msgid "Discovered Host"
+msgid_plural "Discovered Hosts"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../app/views/dashboard/_discovery_widget.html.erb:9
 msgid "No discovered hosts available"
 msgstr ""
@@ -760,97 +753,79 @@ msgstr ""
 msgid "Host"
 msgstr "Amfitrió"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:8
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:18
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:10
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:4 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7 ../app/views/discovered_hosts/_selected_hosts.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:18 ../app/views/discovered_mailer/discovered_summary.text.erb:10
 msgid "Model"
 msgstr "Model"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:20
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:12
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:5 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9 ../app/views/discovered_mailer/discovered_summary.html.erb:20 ../app/views/discovered_mailer/discovered_summary.text.erb:12
 msgid "CPUs"
 msgstr "Les CPU"
 
-#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:9
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:21
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:13
+#: ../app/views/dashboard/_discovery_widget_host_list.html.erb:6 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
 msgid "Memory"
 msgstr "Memòria"
 
-#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:25
+#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:23
 msgid "Customize Host"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:26
+#: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
 msgid "Create Host"
 msgstr "Crea un amfitrió"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
 msgid "Select all items in this page"
 msgstr "Selecciona tots els ítems en aquesta pàgina"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
 msgid "items selected. Uncheck to Clear"
 msgstr "ítems seleccionats. Desmarca per netejar"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:7
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:17
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:6 ../app/views/discovered_hosts/_selected_hosts.html.erb:7 ../app/views/discovered_mailer/discovered_summary.html.erb:17 ../app/views/discovered_mailer/discovered_summary.text.erb:9
 msgid "Name"
 msgstr "Nom"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:7
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:19
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:8 ../app/views/discovered_mailer/discovered_summary.html.erb:19 ../app/views/discovered_mailer/discovered_summary.text.erb:11
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
 msgid "Disk Count"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
 msgid "Disks Size"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:9
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
 msgid "Organization"
 msgstr "Organització"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
 msgid "Subnet"
 msgstr "Subxarxa"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
 msgid "Last Facts Upload"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
-#: ../app/views/discovery_rules/index.html.erb:12
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovery_rules/index.html.erb:12
 msgid "Actions"
 msgstr "Accions"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:51
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:55
 msgid "Please Confirm"
 msgstr "Si us plau, confirmeu"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:57
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:61
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:62
 msgid "Submit"
 msgstr "Envia"
 
@@ -859,9 +834,7 @@ msgid "Provision %s"
 msgstr ""
 
 #: ../app/views/discovered_hosts/multiple_destroy.html.erb:3
-msgid ""
-"This might take a while, as all hosts, facts and reports will be destroyed "
-"as well"
+msgid "This might take a while, as all hosts, facts and reports will be destroyed as well"
 msgstr ""
 
 #: ../app/views/discovered_hosts/select_multiple_location.html.erb:5
@@ -900,20 +873,6 @@ msgstr "Adreça IP"
 msgid "Collapse All"
 msgstr ""
 
-#: ../app/views/discovered_hosts/welcome.html.erb:7
-msgid "No discovered hosts found in this context."
-msgstr ""
-
-#: ../app/views/discovered_hosts/welcome.html.erb:8
-msgid ""
-"This page shows discovered bare-metal or virtual nodes waiting to be "
-"provisioned."
-msgstr ""
-
-#: ../app/views/discovered_hosts/welcome.html.erb:9
-msgid "Learn more about this in the documentation."
-msgstr "Obteniu més informació sobre això a la documentació."
-
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:6
 msgid "Summary report for discovered hosts from Foreman"
 msgstr ""
@@ -922,23 +881,19 @@ msgstr ""
 msgid "<b>Foreman</b> Discovered hosts summary"
 msgstr ""
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:10
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:5
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:10 ../app/views/discovered_mailer/discovered_summary.text.erb:5
 msgid "Summary from %{time} ago to %{now}"
 msgstr ""
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:11
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:3
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:11 ../app/views/discovered_mailer/discovered_summary.text.erb:3
 msgid "Discovered hosts from Foreman server at %{foreman_url}"
 msgstr ""
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:22
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:22 ../app/views/discovered_mailer/discovered_summary.text.erb:14
 msgid "Disk count"
 msgstr "Nombre de discs"
 
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
+#: ../app/views/discovered_mailer/discovered_summary.html.erb:23 ../app/views/discovered_mailer/discovered_summary.text.erb:15
 msgid "Disks size"
 msgstr "Mida de disc"
 
@@ -987,45 +942,34 @@ msgid "Rule priority (lower integer means higher priority)"
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:2
-msgid ""
-"Specify target hostname template pattern in the same syntax as in "
-"Provisioning Templates (ERB)."
+msgid "Specify target hostname template pattern in the same syntax as in Provisioning Templates (ERB)."
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:4
-msgid ""
-"Domain will be appended automatically. A hostname based on MAC address will "
-"be used when left blank."
+msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:5
-msgid ""
-"In addition to @host attribute function rand for random integers is "
-"available. Examples:"
+msgid "In addition to @host attribute function rand for random integers is available. Examples:"
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:8
-msgid ""
-"When creating hostname patterns, make sure the resulting host names are "
-"unique."
+msgid "When creating hostname patterns, make sure the resulting host names are unique."
 msgstr ""
 
 #: ../app/views/discovery_rules/_template_inline.erb:9
-msgid ""
-"Hostnames must not start with numbers. A good approach is to use unique "
-"information provided by facter (MAC address, BIOS or serial ID)."
+msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
 msgstr ""
 
 #: ../app/views/discovery_rules/edit.html.erb:1
 msgid "Edit %s"
 msgstr "Edita %s"
 
-#: ../app/views/discovery_rules/index.html.erb:1
-#: ../lib/foreman_discovery/engine.rb:163
+#: ../app/views/discovery_rules/index.html.erb:1 ../lib/foreman_discovery/engine.rb:164
 msgid "Discovery Rules"
 msgstr "Regles de descobriment"
 
-#: ../app/views/discovery_rules/index.html.erb:2
+#: ../app/views/discovery_rules/index.html.erb:2 ../webpack/src/ForemanDiscovery/DiscoveryRules/Components/EmptyState/EmptyState.js:9
 msgid "Create Rule"
 msgstr ""
 
@@ -1057,6 +1001,10 @@ msgstr "Habilitada"
 msgid "New Discovery Rule"
 msgstr "Regla de descobriment nova"
 
+#: ../app/views/discovery_rules/welcome.html.erb:8
+msgid "Discovered Rules"
+msgstr ""
+
 #: ../db/seeds.d/50_discovery_templates.rb:5
 msgid "Command line options for kexec during PXE-less provisioning."
 msgstr ""
@@ -1077,28 +1025,32 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:179
+#: ../lib/foreman_discovery/engine.rb:180
 msgid "Discovery Kexec template"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:188
+#: ../lib/foreman_discovery/engine.rb:189
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:189
-msgid ""
-"Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:190
+msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:190
-msgid ""
-"ID of Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+#: ../lib/foreman_discovery/engine.rb:191
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
+#: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:33
+msgid "For more information please see "
+msgstr ""
+
+#: ../webpack/__mocks__/foremanReact/components/common/EmptyState/EmptyStatePattern.js:34
+msgid "documentation"
 msgstr ""
 
 #: action_names.rb:2
-msgid "Import Puppet classes"
+msgid "Action with sub plans"
 msgstr ""
 
 #: action_names.rb:3
@@ -1106,7 +1058,7 @@ msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Action with sub plans"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:5