foreman_discovery 20.0.0 → 21.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42e909e67952be309ba249d25294fa97227d9ad9dcd6c98b71f93c33e8d94e4c
-  data.tar.gz: ccf2de1a46292d285fbf187e7c65def6c7bb0c210bb1d7a26ad4b7353a967f12
+  metadata.gz: dbc5abad67ec340bdfe3ed25013bd59afd164c5aa5b71197cf115fca531f07f8
+  data.tar.gz: ba6b00159de292b52754d70bab8a79bbd0b77e29f7cba34e2e6e16ab6a5f05a6
 SHA512:
-  metadata.gz: d8fa0da48abb3f11aac1b79b1bc7faa5ec22e9c56543a4802a789a6d626370ccd6c5daa9f5b2faeb4be92af8068d99174a299a5ac865b71de38de8c6785fc369
-  data.tar.gz: 7a832889e8509358be5c7affeed3894cf964e9c2defc29644f54c1f015f872583ab77bfeed39644c89acad6f0cd3bdb34ae4c7fe08261c971f3e631b4cc60fdc
+  metadata.gz: c812aab3400e97c3b25523cc6bb7bd118e86a0c6c71383275f442e3c49f71d6a87d6a3f413b9ac5e3b0278d8e8fd7c3cd535bf9dcfc6e2f033433d674f1dcb46
+  data.tar.gz: f8f22a7eecfa7cdb30f22e691b8433983719d8449b71d9330c6fbf8bfe4240359846b701b71456b46d3b5acca469c65062f4ca57d608913d4ca15fcb16b99352

data/app/models/host/discovered.rb

@@ -63,7 +63,8 @@ class Host::Discovered < ::Host::Base
     bootif_mac = FacterUtils::bootif_mac(facts).try(:downcase)
     hostname = ''
     if Setting[:discovery_naming] == 'MAC-name'
-      hostname = NameGenerator.new.generate_next_mac_name(bootif_mac)
+      hostname_mac = return_first_valid_mac(Setting::Discovered.discovery_hostname_fact_array, facts) || bootif_mac
+      hostname = NameGenerator.new.generate_next_mac_name(hostname_mac)
     elsif Setting[:discovery_naming] == 'Random-name'
       hostname = NameGenerator.new.generate_next_random_name
     else
@@ -226,6 +227,14 @@ class Host::Discovered < ::Host::Base
     hostname
   end
 
+  def self.return_first_valid_mac(facts_array, facts)
+    return facts[facts_array] if !facts_array.is_a?(Array)
+    facts_array.each do |value|
+      return facts[value] if !facts[value].nil? && facts[value].match(/([0-9A-Fa-f]{2}:){5}([0-9A-Fa-f]{2})/)
+    end
+    return nil
+  end
+
   def self.return_first_valid_fact(facts_array, facts)
     return facts[facts_array] if !facts_array.is_a?(Array)
     facts_array.each do |value|

data/app/models/setting/discovered.rb

@@ -1,46 +1,4 @@
-class Setting::Discovered < ::Setting
-  BLANK_ATTRS << "discovery_location"
-  BLANK_ATTRS << "discovery_organization"
-  BLANK_ATTRS << "discovery_fact_column"
-  BLANK_ATTRS << 'discovery_facts_highlights'
-  BLANK_ATTRS << 'discovery_facts_storage'
-  BLANK_ATTRS << 'discovery_facts_software'
-  BLANK_ATTRS << 'discovery_facts_hardware'
-  BLANK_ATTRS << 'discovery_facts_network'
-  BLANK_ATTRS << 'discovery_facts_ipmi'
-
-  STRING_PRESENCE_ATTRS = ['discovery_hostname', 'discovery_prefix']
-  validates :value, :presence => true, :if => proc { |s| STRING_PRESENCE_ATTRS.include?(s.name) }
-
-  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} }),
-      self.set('discovery_prefer_ipv6', N_("Prefer IPv6 to IPv4 when calling discovered nodes"), false, N_("Prefer IPv6")),
-    ]
-  end
-
+class Setting::Discovered
   def self.discovery_fact_column_array
     from_array(Setting['discovery_fact_column'])
   end

data/app/services/foreman_discovery/host_converter.rb

@@ -52,14 +52,21 @@ class ForemanDiscovery::HostConverter
     end
   end
 
+  def self.ip_for_subnet(subnet, mac, ip) 
+    return ip if ip && subnet&.unused_ip(mac)&.ip_include?(ip)
+
+    unused_ip_for_subnet(subnet, mac, 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.ip = ip_for_subnet(interface.subnet, interface.mac, interface.ip) if interface.subnet
+      interface.ip6 = ip_for_subnet(interface.subnet6, interface.mac, interface.ip6) if interface.subnet6
     end
   end
 

data/app/views/foreman_discovery/debian_kexec.erb

@@ -4,18 +4,17 @@ name: Discovery Debian kexec
 oses:
 - Debian
 - Ubuntu
--%>
-<%#
-This template is used to pass command line options to kexec when reloading
-kernel on a discovered host instead of rebooting. This is useful in PXE-less
-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 --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.
+description: |
+  This template is used to pass command line options to kexec when reloading
+  kernel on a discovered host instead of rebooting. This is useful in PXE-less
+  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 --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']
@@ -31,10 +30,12 @@ Extra options like --reset-vga can be set via "extra" array.
   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_param('lang') || 'en_US'}"
   options << "inst.stage2=#{@host.operatingsystem.medium_uri(@host)}" if @host.operatingsystem.name.match(/Atomic/i)
+  extra = []
+  extra << "--kexec-file-syscall" if @host.pxe_loader.include?('SecureBoot')
 -%>
 {
   "kernel": "<%= @kernel_uri %>",
   "initram": "<%= @initrd_uri %>",
   "append": "url=<%= foreman_url('provision') + "&static=yes" %> interface=<%= mac %> netcfg/get_ipaddress=<%= ip %> netcfg/get_netmask=<%= mask %> netcfg/get_gateway=<%= gw %> netcfg/get_nameservers=<%= dns %> netcfg/disable_dhcp=true netcfg/get_hostname=<%= @host.name %> BOOTIF=<%= bootif %> <%= options.compact.join(' ') %>",
-  "extra": []
+  "extra": <%= extra %>
 }

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -14,18 +14,17 @@ oses:
 - RedHat 5
 - RedHat 6
 - RedHat 7
--%>
-<%#
-This template is used to pass command line options to kexec when reloading
-kernel on a discovered host instead of rebooting. This is useful in PXE-less
-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 --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.
+description: |
+  This template is used to pass command line options to kexec when reloading
+  kernel on a discovered host instead of rebooting. This is useful in PXE-less
+  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 --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']
@@ -41,15 +40,17 @@ Extra options like --reset-vga can be set via "extra" array.
   if @host.operatingsystem.name != 'Fedora' && @host.operatingsystem.major.to_i >= 7 && host_param_true?('fips_enabled')
     options.push('fips=1')
   end
+  extra = []
+  extra << "--kexec-file-syscall" if @host.pxe_loader.include?('SecureBoot')
 -%>
 {
   "kernel": "<%= @kernel_uri %>",
   "initram": "<%= @initrd_uri %>",
 <% if (@host.operatingsystem.name == 'Fedora' and @host.operatingsystem.major.to_i > 16) or
     (@host.operatingsystem.name != 'Fedora' and @host.operatingsystem.major.to_i >= 7) -%>
-  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
+  "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% else -%>
-  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
+  "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% end -%>
-  "extra": []
+  "extra": <%= extra %>
 }

data/lib/foreman_discovery/engine.rb

@@ -45,38 +45,201 @@ module ForemanDiscovery
       Foreman::Plugin.register :foreman_discovery do
         requires_foreman '>= 3.2'
 
-        # discovered hosts permissions
-        security_block :discovery do
-          permission :view_discovered_hosts, {
-            :discovered_hosts          => [:index, :show, :auto_complete_search, :welcome],
-            :"api/v2/discovered_hosts" => [:index, :show],
-            :'discovered_hosts/react' => [:index]
-          }, :resource_type => 'Host'
-          permission :submit_discovered_hosts, {
-            :"api/v2/discovered_hosts" => [:facts, :create]
-          }, :resource_type => 'Host'
-          permission :auto_provision_discovered_hosts, {
-            :discovered_hosts          => [:auto_provision,
-                                           :multiple_auto_provision,
-                                           :submit_multiple_auto_provision],
-            :"api/v2/discovered_hosts" => [:auto_provision, :auto_provision_all]
-          }, :resource_type => 'Host'
-          permission :provision_discovered_hosts, {
-            :discovered_hosts          => [:edit, :update],
-            :"api/v2/discovered_hosts" => [:update]
-          }, :resource_type => 'Host'
-          permission :edit_discovered_hosts, {
-            :discovered_hosts          => [:update_multiple_location,
-                                           :select_multiple_organization,
-                                           :update_multiple_organization,
-                                           :select_multiple_location,
-                                           :refresh_facts,
-                                           :reboot,
-                                           :multiple_reboot,
-                                           :submit_multiple_reboot],
-            :hosts                     => [:process_hostgroup],
-            :"api/v2/discovered_hosts" => [:refresh_facts, :reboot, :reboot_all]
-          }, :resource_type => 'Host'
+        # settings
+        settings do
+          category :discovery, N_("Discovery") do
+            snippets = Proc.new {
+              Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]
+            }
+
+            setting "discovery_location",
+              type: :string,
+              collection: Proc.new { Hash[[['', '']].concat Location.all.map{|loc| [loc[:title], loc[:title]]}] },
+              default: "",
+              full_name: N_("Discovery location"),
+              description: N_("The default location to place discovered hosts in")
+
+            setting "discovery_organization",
+              type: :string,
+              collection: Proc.new { Hash[[['', '']].concat Organization.all.map{|org| [org[:title], org[:title]]}] },
+              default: "",
+              full_name: N_("Discovery location"),
+              description: N_("The default location to place discovered hosts in")
+
+            setting "discovery_fact",
+              type: :string,
+              default: "discovery_bootif",
+              full_name: N_("Interface fact"),
+              description: N_("Fact name to use for primary interface detection")
+
+            setting "discovery_auto_bond",
+              type: :boolean,
+              default: false,
+              full_name: N_("Create bond interfaces"),
+              description: N_("Automatic bond interface (if another interface is detected on the same VLAN via LLDP)")
+
+            setting "discovery_clean_facts",
+              type: :boolean,
+              default: false,
+              full_name: N_("Clean all facts"),
+              description: N_("Clean all reported facts during provisioning (except discovery facts)")
+
+            setting "discovery_hostname",
+              type: :string,
+              default: "discovery_bootif",
+              full_name: N_("Hostname facts"),
+              description: N_("List of facts to use for the hostname (separated by comma, first wins)")
+
+            validates "discovery_hostname", presence: true
+
+            setting "discovery_auto",
+              type: :boolean,
+              default: false,
+              full_name: N_("Auto provisioning"),
+              description: N_("Automatically provision newly discovered hosts, according to the provisioning rules")
+
+            setting "discovery_reboot",
+              type: :boolean,
+              default: true,
+              full_name: N_("Reboot"),
+              description: N_("Automatically reboot or kexec discovered host during provisioning")
+
+            setting "discovery_prefix",
+              type: :string,
+              default: "mac",
+              full_name: N_("Hostname prefix"),
+              description: N_("The default prefix to use for the host name, must start with a letter")
+
+            validates "discovery_prefix", presence: true
+
+            setting "discovery_fact_column",
+              type: :string,
+              default: "",
+              full_name: N_("Fact columns"),
+              description: N_("Extra facter columns to show in host lists (separate by comma)")
+
+            setting "discovery_facts_highlights",
+              type: :string,
+              default: "",
+              full_name: N_("Highlighted facts"),
+              description: N_("Regex to organize facts for highlights section - e.g. ^(abc|cde)$")
+
+            setting "discovery_facts_storage",
+              type: :string,
+              default: "",
+              full_name: N_("Storage facts"),
+              description: N_("Regex to organize facts for storage section")
+
+            setting "discovery_facts_software",
+              type: :string,
+              default: "",
+              full_name: N_("Software facts"),
+              description: N_("Regex to organize facts for software section")
+
+            setting "discovery_facts_hardware",
+              type: :string,
+              default: "",
+              full_name: N_("Hardware facts"),
+              description: N_("Regex to organize facts for hardware section")
+
+            setting "discovery_facts_network",
+              type: :string,
+              default: "",
+              full_name: N_("Network facts"),
+              description: N_("Regex to organize facts for network section")
+
+            setting "discovery_facts_ipmi",
+              type: :string,
+              default: "",
+              full_name: N_("IPMI facts"),
+              description: N_("Regex to organize facts for ipmi section")
+
+            setting "discovery_lock",
+              type: :boolean,
+              default: false,
+              full_name: N_("Lock PXE"),
+              description: N_("Automatically generate PXE configuration to pin a newly discovered host to discovery")
+
+            setting "discovery_pxelinux_lock_template",
+              type: :string,
+              collection: snippets,
+              default: "pxelinux_discovery",
+              full_name: N_("Locked PXELinux template name"),
+              description: N_("PXELinux template to be used when pinning a host to discovery")
+
+            setting "discovery_pxegrub_lock_template",
+              type: :string,
+              collection: snippets,
+              default: "pxegrub_discovery",
+              full_name: N_("Locked PXEGrub template name"),
+              description: N_("PXEGrub template to be used when pinning a host to discovery")
+
+            setting "discovery_pxegrub2_lock_template",
+              type: :string,
+              collection: snippets,
+              default: "pxegrub2_discovery",
+              full_name: N_("Locked PXEGrub2 template name"),
+              description: N_("PXEGrub2 template to be used when pinning a host to discovery")
+
+            setting "discovery_always_rebuild_dns",
+              type: :boolean,
+              default: true,
+              full_name: N_("Force DNS"),
+              description: N_("Force DNS entries creation when provisioning discovered host")
+
+            setting "discovery_error_on_existing",
+              type: :boolean,
+              default: false,
+              full_name: N_("Error on existing NIC"),
+              description: N_("Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)")
+
+            setting "discovery_naming",
+              type: :string,
+              collection: Proc.new { ::Host::Discovered::NAMING_PATTERNS },
+              default: "Fact",
+              full_name: N_("Type of name generator"),
+              description: N_("Discovery hostname naming pattern")
+
+            setting "discovery_prefer_ipv6",
+              type: :boolean,
+              default: false,
+              full_name: N_("Prefer IPv6"),
+              description: N_("Prefer IPv6 to IPv4 when calling discovered nodes")
+            end
+          end
+
+          # discovered hosts permissions
+          security_block :discovery do
+            permission :view_discovered_hosts, {
+              :discovered_hosts          => [:index, :show, :auto_complete_search, :welcome],
+              :"api/v2/discovered_hosts" => [:index, :show],
+              :'discovered_hosts/react' => [:index]
+            }, :resource_type => 'Host'
+            permission :submit_discovered_hosts, {
+              :"api/v2/discovered_hosts" => [:facts, :create]
+            }, :resource_type => 'Host'
+            permission :auto_provision_discovered_hosts, {
+              :discovered_hosts          => [:auto_provision,
+                                             :multiple_auto_provision,
+                                             :submit_multiple_auto_provision],
+                                             :"api/v2/discovered_hosts" => [:auto_provision, :auto_provision_all]
+            }, :resource_type => 'Host'
+            permission :provision_discovered_hosts, {
+              :discovered_hosts          => [:edit, :update],
+              :"api/v2/discovered_hosts" => [:update]
+            }, :resource_type => 'Host'
+            permission :edit_discovered_hosts, {
+              :discovered_hosts          => [:update_multiple_location,
+                                             :select_multiple_organization,
+                                             :update_multiple_organization,
+                                             :select_multiple_location,
+                                             :refresh_facts,
+                                             :reboot,
+                                             :multiple_reboot,
+                                             :submit_multiple_reboot],
+                                             :hosts                     => [:process_hostgroup],
+                                             :"api/v2/discovered_hosts" => [:refresh_facts, :reboot, :reboot_all]
+            }, :resource_type => 'Host'
           permission :destroy_discovered_hosts, {
             :discovered_hosts          => [:destroy, :submit_multiple_destroy, :multiple_destroy],
             :"api/v2/discovered_hosts" => [:destroy]

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "20.0.0"
+  VERSION = "21.0.1"
 end

data/locale/ca/foreman_discovery.po

@@ -7,10 +7,10 @@
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-09-20 17:24+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -134,7 +134,7 @@ msgid "Destroyed selected hosts"
 msgstr "S'han destruït els amfitrions seleccionats"
 
 msgid "Details"
-msgstr ""
+msgstr "Detalls"
 
 msgid "Disable"
 msgstr "Inhabilita"
@@ -310,7 +310,7 @@ msgid "Foreman discovered hosts summary"
 msgstr ""
 
 msgid "Hardware"
-msgstr ""
+msgstr "Maquinari"
 
 msgid "Hardware facts"
 msgstr ""
@@ -331,7 +331,7 @@ msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
 msgid "Host Group"
-msgstr ""
+msgstr "Grup dels amfitrions"
 
 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"
@@ -365,10 +365,10 @@ msgid "Hostnames must not start with numbers. A good approach is to use unique i
 msgstr ""
 
 msgid "Hosts"
-msgstr ""
+msgstr "Amfitrions"
 
 msgid "Hosts Limit"
-msgstr ""
+msgstr "Límit d'amfitrions"
 
 msgid "Hosts/Limit"
 msgstr ""
@@ -497,7 +497,7 @@ msgid "Name of the parameter"
 msgstr "Nom del paràmetre"
 
 msgid "Network"
-msgstr ""
+msgstr "Xarxa"
 
 msgid "Network facts"
 msgstr ""
@@ -511,12 +511,18 @@ msgstr ""
 msgid "New in the last 24 hours"
 msgstr "Nou en les últimes 24 hores"
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr ""
 
 msgid "No discovered hosts for the selected period"
 msgstr ""
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -677,7 +683,7 @@ msgid "Specify target hostname template pattern in the same syntax as in Provisi
 msgstr ""
 
 msgid "Storage"
-msgstr ""
+msgstr "Emmagatzematge"
 
 msgid "Storage facts"
 msgstr ""
@@ -716,7 +722,7 @@ msgid "This might take a while, as all hosts, facts and reports will be destroye
 msgstr ""
 
 msgid "Type"
-msgstr ""
+msgstr "Tipus"
 
 msgid "Type of name generator"
 msgstr ""

data/locale/de/foreman_discovery.po

@@ -15,10 +15,10 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2021-10-13 15:12+0000\n"
-"Last-Translator: Patrick Dolinic\n"
+"PO-Revision-Date: 2013-11-15 17:25+0000\n"
+"Last-Translator: Patrick Dolinic, 2021\n"
 "Language-Team: German (http://www.transifex.com/foreman/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -518,12 +518,18 @@ msgstr "Neue Hosts"
 msgid "New in the last 24 hours"
 msgstr "Neu in den letzten 24 Stunden"
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr "Keine entdeckten Hosts verfügbar"
 
 msgid "No discovered hosts for the selected period"
 msgstr "Keine entdeckten Hosts für den ausgewählten Zeitraum"
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr "Keine entdeckten Hosts zur Bereitstellung"
 

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 18.0.1\n"
+"Project-Id-Version: foreman_discovery 21.0.0\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -504,12 +504,18 @@ msgstr ""
 msgid "New in the last 24 hours"
 msgstr ""
 
+msgid "No Discovery Rules found in this context. Create Discovery Rules to perform automated provisioning on Discovered Hosts"
+msgstr ""
+
 msgid "No discovered hosts available"
 msgstr ""
 
 msgid "No discovered hosts for the selected period"
 msgstr ""
 
+msgid "No discovered hosts found in this context. This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
+msgstr ""
+
 msgid "No discovered hosts to provision"
 msgstr ""