foreman_discovery 16.1.2 → 16.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef6a4731f46b5f34f372a87f8da770e0510504664852ef61253677bb587c8842
-  data.tar.gz: 75715ed1dae928289c3189443f8f290c6fa95a681678610c0aca980b18825aa1
+  metadata.gz: accf12de8ae1253e5023ba98c65da7c3af14aa8da4691fe67dd7f18bc5717518
+  data.tar.gz: 0dd4c83a875917ccf3933679a31a747d8f559e5195415fab619cc0220bcd97c4
 SHA512:
-  metadata.gz: 5882e04be01b4d3f213acf4b751a0a4784436cd97558ab1e9448f8976e89f86db047c986923da5d62f72757c86430790590c942f0579ba62224f7ce458ef9c9d
-  data.tar.gz: 154d39a5d013b431ce6367d5a0f87e06521df092c36a4d95da0114062f4aef569ddd80600ac077db7639b9628739056e66d619de7604e026e45f57406a069c3c
+  metadata.gz: a8fd61670a325106898043ab9533f7512835394a6141139580436e9c8fdd0027ff0aee02c0a53f6d92b5b4535d5bcbcabfb1cd91ddc0fd85ce8a0a54d2cde27e
+  data.tar.gz: 90263e8535e3d338ee335a280ff89dafd188d7e92c8f7becb340bc6ede0884bbf4ee915ad158de546c84058240c7338d1d4a736f3124e8c6c57f935862073f83

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/models/host/discovered.rb

@@ -44,9 +44,13 @@ class Host::Discovered < ::Host::Base
 
   # Discovery import workflow:
   # discovered#import_host ->
-  #  discovered#import_facts -> base#import_facts -> base#parse_facts ->
-  #  discovered#populate_fields_from_facts -> base#populate_fields_from_facts -> base#set_interfaces
-  #  discovered#populate_discovery_fields_from_facts
+  # ForemanDiscovery::HostFactImporter#import_facts ->
+  # ::HostFactImporter#import_facts ->
+  # ::HostFactImporter#parse_facts ->
+  # discovered#populate_fields_from_facts ->
+  # base#populate_fields_from_facts ->
+  # base#set_interfaces ->
+  # discovered#populate_discovery_fields_from_facts
   def self.import_host facts
     raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash) || facts.is_a?(ActionController::Parameters)
 
@@ -92,19 +96,11 @@ class Host::Discovered < ::Host::Base
 
     # and save (interfaces are created via puppet parser extension)
     host.save(:validate => false) if host.new_record?
-    raise ::Foreman::Exception.new(N_("Facts could not be imported")) unless host.import_facts(facts)
+    importer = ForemanDiscovery::HostFactImporter.new(host)
+    raise ::Foreman::Exception.new(N_("Facts could not be imported")) unless importer.import_facts(facts)
     host
   end
 
-  def import_facts(facts)
-    # Discovered Hosts won't report in via puppet, so we can use that field to
-    # record the last time it sent facts...
-    self.last_report = Time.now
-    # Set the correct facts type for new foreman facts importing code.
-    facts[:_type] = :foreman_discovery
-    super(facts)
-  end
-
   def setup_clone
     # Nic::Managed needs this method but Discovered hosts shouldn't
     # be doing orchestration anyway...
@@ -144,7 +140,7 @@ class Host::Discovered < ::Host::Base
   def refresh_facts
     facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(self.ip)).facter
     self.class.import_host facts
-    import_facts facts
+    ::ForemanDiscovery::HostFactImporter.new(self).import_facts facts
   rescue => e
     ::Foreman::Logging.exception("Unable to get facts from proxy", e)
     raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url, :error => e)

data/app/models/setting/discovered.rb

@@ -8,7 +8,9 @@ class Setting::Discovered < ::Setting
   BLANK_ATTRS << 'discovery_facts_hardware'
   BLANK_ATTRS << 'discovery_facts_network'
   BLANK_ATTRS << 'discovery_facts_ipmi'
-  BLANK_ATTRS << 'discovery_prefix'
+
+  STRING_PRESENCE_ATTRS = ['discovery_hostname', 'discovery_prefix']
+  validates :value, :presence => true, :if => proc { |s| STRING_PRESENCE_ATTRS.include?(s.name) }
 
   def self.default_settings
     [

data/app/services/foreman_discovery/host_fact_importer.rb

@@ -0,0 +1,10 @@
+class ForemanDiscovery::HostFactImporter < ::HostFactImporter
+    def import_facts(facts)
+        # Discovered Hosts won't report in via puppet, so we can use that field to
+        # record the last time it sent facts...
+        host.last_report = Time.now
+        # Set the correct facts type for new foreman facts importing code.
+        facts[:_type] = :foreman_discovery
+        super(facts)
+    end
+end

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

@@ -12,9 +12,10 @@ environments. The template must generate JSON format with the following items
 "kernel", "initram", "append" and "extra". The kexec command is composed in
 the following way:
 
-kexec --force --reset-vga --append=$append --initrd=$initram $extra $kernel
+kexec --force --debug --append=$append --initrd=$initram $extra $kernel
 
 Please read kexec(8) man page for more information about semantics.
+Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -22,9 +22,10 @@ environments. The template must generate JSON format with the following items
 "kernel", "initram", "append" and "extra". The kexec command is composed in
 the following way:
 
-kexec --force --reset-vga --append=$append --initrd=$initram $extra $kernel
+kexec --force --debug --append=$append --initrd=$initram $extra $kernel
 
 Please read kexec(8) man page for more information about semantics.
+Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']

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

@@ -43,7 +43,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 1.24.0'
+        requires_foreman '>= 2.2'
 
         # discovered hosts permissions
         security_block :discovery do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "16.1.2"
+  VERSION = "16.2.0"
 end

data/locale/ca/foreman_discovery.po

@@ -7,7 +7,7 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.0.1\n"
+"Project-Id-Version: foreman_discovery 16.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-05-26 17:21+0000\n"
 "Last-Translator: Transifex Bot <>\n"
@@ -697,6 +697,9 @@ msgstr ""
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
+msgid "Unable to perform %{action} on %{ips}"
+msgstr ""
+
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 

data/locale/de/foreman_discovery.po

@@ -14,7 +14,7 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.0.1\n"
+"Project-Id-Version: foreman_discovery 16.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-05-26 17:21+0000\n"
 "Last-Translator: Transifex Bot <>\n"
@@ -703,6 +703,9 @@ msgstr "Keine Entdeckungsregel gefunden, kein Host bereitgestellt (Berechtigunge
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
+msgid "Unable to perform %{action} on %{ips}"
+msgstr ""
+
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 

data/locale/en/foreman_discovery.po

@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.0.1\n"
+"Project-Id-Version: foreman_discovery 16.1.0\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -690,6 +690,9 @@ msgstr ""
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr ""
 
+msgid "Unable to perform %{action} on %{ips}"
+msgstr ""
+
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 

data/locale/en_GB/foreman_discovery.po

@@ -10,7 +10,7 @@
 # Lukáš Zapletal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.0.1\n"
+"Project-Id-Version: foreman_discovery 16.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-05-26 17:21+0000\n"
 "Last-Translator: Transifex Bot <>\n"
@@ -700,6 +700,9 @@ msgstr "Unable to find a discovery rule, no host provided (check permissions)"
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 
+msgid "Unable to perform %{action} on %{ips}"
+msgstr ""
+
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 

data/locale/es/foreman_discovery.po

@@ -9,7 +9,7 @@
 # Sergio Ocón-Cárdenas <sergio.ocon@redhat.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.0.1\n"
+"Project-Id-Version: foreman_discovery 16.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-05-26 17:21+0000\n"
 "Last-Translator: Transifex Bot <>\n"
@@ -699,6 +699,9 @@ msgstr "No es posible buscar una regla de detección, no se ha aprovisionado un
 msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
 msgstr "No se puede encontrar la NIC principal con %{mac} especificada mediante '%{fact}', filtro de NIC: %{filter}"
 
+msgid "Unable to perform %{action} on %{ips}"
+msgstr ""
+
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 

data/locale/foreman_discovery.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-27 14:11+0200\n"
-"PO-Revision-Date: 2020-05-27 14:11+0200\n"
+"POT-Creation-Date: 2020-09-16 15:41+0200\n"
+"PO-Revision-Date: 2020-09-16 15:41+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -273,43 +273,43 @@ msgstr ""
 msgid "Discovered hosts are provisioning now"
 msgstr ""
 
-#: ../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 ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:306
+#: ../app/controllers/discovered_hosts_controller.rb:308
 msgid "No hosts selected"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:312
+#: ../app/controllers/discovered_hosts_controller.rb:314
 msgid "Something went wrong while selecting hosts - %s"
 msgstr ""
 
@@ -338,7 +338,7 @@ msgstr ""
 
 #: ../app/helpers/discovered_hosts_helper.rb:16
 #: ../app/helpers/discovered_hosts_helper.rb:30
-#: ../app/models/setting/discovered.rb:22
+#: ../app/models/setting/discovered.rb:24
 #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
 msgid "Reboot"
 msgstr ""
@@ -471,39 +471,43 @@ 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 ""
 
-#: ../app/models/host/discovered.rb:56
+#: ../app/models/host/discovered.rb:60
 msgid ""
 "Expected discovery_fact '%s' is missing, unable to detect primary interface an"
 "d set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:69
+#: ../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 ""
 
-#: ../app/models/host/discovered.rb:162
+#: ../app/models/host/discovered.rb:160
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:181
+#: ../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:179
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:207
+#: ../app/models/host/discovered.rb:203
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -531,191 +535,191 @@ 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
+#: ../app/models/setting/discovered.rb:20
 msgid ""
 "Automatic bond interface (if another interface is detected on the same VLAN vi"
 "a 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
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../app/models/setting/discovered.rb:30
+#: ../app/models/setting/discovered.rb:32
 msgid "IPMI facts"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:31
+#: ../app/models/setting/discovered.rb:33
 msgid ""
 "Automatically generate PXE configuration to pin a newly discovered host to dis"
 "covery"
 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
+#: ../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 ""
 
@@ -733,15 +737,15 @@ msgid ""
 "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 ""
 
@@ -781,11 +785,11 @@ msgstr ""
 msgid "Memory"
 msgstr ""
 
-#: ../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 ""
 
@@ -1101,11 +1105,11 @@ msgid "Remote action:"
 msgstr ""
 
 #: action_names.rb:3
-msgid "Import facts"
+msgid "Import Puppet classes"
 msgstr ""
 
 #: action_names.rb:4
-msgid "Import Puppet classes"
+msgid "Import facts"
 msgstr ""
 
 #: action_names.rb:5