foreman_discovery 17.0.0 → 17.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72a3be5def914f11b7186ee0dee5289a2ab43d7294404843736dd3097af42a82
-  data.tar.gz: 3bc20158d91425e487c81b115230c09b6a7d40bfaf604149e429f2e485cf0f04
+  metadata.gz: 35fdf9e36a5a8093c7532a47c9e9a8fd2bae879a30eab70fcc286c9b6c1cd256
+  data.tar.gz: 145fc876af62068eebcdc997f6e8ffaa1bc9861ff6aab63ef992396da32277f3
 SHA512:
-  metadata.gz: bf1f325066358628d3d0682efe0819cb7e3511b175bb709d97a8c977cf4cd77d49648730dc6bf98749d317adb01e404baacd5995b0c88d9d6bda44c4e715e952
-  data.tar.gz: 14197db5b6c073d1b1a490cb06a226687a38b3cb73db4c48c900848df986325ce0204c6d4f0bf95eb1eab27a363591bb8cda50ab6e0f75a62833a69dbc48ab19
+  metadata.gz: 87665e788d3aa6db8d3b9b13d5165a23ca4509dfb1bd98cd76bdc46f6779d6aa279aa95a044ac0ae515ac652d88d28c0a792f7c8eeb7b664ec57dabc3aab2023
+  data.tar.gz: 5cad4226da69dd1ed80fcfa89ff20c4a590373c00753f1a390ceb0a324401b8c96f52aabece9f86ed70c86be542e6afd73e5dcbdd70367f1f2ddcfdd5cd7f924

data/app/controllers/discovery_rules_controller.rb

@@ -20,7 +20,7 @@ class DiscoveryRulesController < ApplicationController
   end
 
   def clone
-    @discovery_rule = @discovery_rule.deep_clone except: [:name, :priority]
+    @discovery_rule.deep_clone except: [:name, :priority], include: [:organizations, :locations]
     @discovery_rule.priority = DiscoveryRule.suggest_priority
   end
 

data/app/helpers/discovered_hosts_helper.rb

@@ -98,8 +98,7 @@ module DiscoveredHostsHelper
     discovered_host_path(host)
   end
 
-  def discovery_doc_url
-    doc_version = Foreman::Plugin.find(:foreman_discovery).version.scan(/\d+\.\d+/).first
-    "https://theforeman.org/plugins/foreman_discovery/#{doc_version}"
+  def discovery_doc_version
+    Foreman::Plugin.find(:foreman_discovery).version.scan(/\d+\.\d+/).first
   end
 end

data/app/models/host/discovered.rb

@@ -133,26 +133,39 @@ class Host::Discovered < ::Host::Base
     subnet.present? && subnet.discovery.present?
   end
 
+  def ip4or6
+    if Setting[:discovery_prefer_ipv6]
+      IPAddr.new(self.ip6 || self.ip)
+    else
+      IPAddr.new(self.ip || self.ip6)
+    end
+  end
+
   def proxy_url(node_ip)
-    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{node_ip}:8443"
+    wrapped_ip = node_ip.ipv6? ? "[#{node_ip}]" : node_ip
+    proxied? ? subnet.discovery.url + "/discovery/#{node_ip}" : "https://#{wrapped_ip}:8443"
   end
 
   def refresh_facts
-    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(self.ip)).facter
+    facts = ::ForemanDiscovery::NodeAPI::Inventory.new(:url => proxy_url(ip4or6)).facter
     self.class.import_host 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(self.ip), :error => e)
+    raise ::Foreman::WrappedException.new(e, N_("Could not get facts from proxy %{url}: %{error}"), :url => proxy_url(ip4or6), :error => e)
   end
 
-  def reboot(old_ip = nil, new_ip = nil)
+  def reboot(old_ip = nil, new_ip = nil, old_ip6 = nil, new_ip6 = nil)
     # perform the action against the original lease as well as the new reservation
-    ips = [old_ip, new_ip, self.ip].compact.uniq
+    if Setting[:discovery_prefer_ipv6]
+      ips = [old_ip6, new_ip6, self.ip6, old_ip, new_ip, self.ip].compact.uniq
+    else
+      ips = [old_ip, new_ip, self.ip, old_ip6, new_ip6, self.ip6].compact.uniq
+    end
     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)
+        node_url = proxy_url(IPAddr.new(next_ip))
         logger.debug "Performing reboot call against #{node_url}"
         resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
         return true if resource.reboot
@@ -165,13 +178,17 @@ class Host::Discovered < ::Host::Base
     raise ::Foreman::Exception.new(msg, action: "reboot", ips: ips.to_sentence)
   end
 
-  def kexec(json, old_ip = nil, new_ip = nil)
+  def kexec(json, old_ip = nil, new_ip = nil, old_ip6 = nil, new_ip6 = nil)
     # perform the action against the original lease as well as the new reservation
-    ips = [old_ip, new_ip, self.ip].compact.uniq
+    if Setting[:discovery_prefer_ipv6]
+      ips = [old_ip6, new_ip6, self.ip6, old_ip, new_ip, self.ip].compact.uniq
+    else
+      ips = [old_ip, new_ip, self.ip, old_ip6, new_ip6, self.ip6].compact.uniq
+    end
     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)
+        node_url = proxy_url(IPAddr.new(next_ip))
         logger.debug "Performing kexec call against #{node_url}"
         resource = ::ForemanDiscovery::NodeAPI::Power.service(:url => node_url)
         return true if resource.kexec(json)

data/app/models/host/managed_extensions.rb

@@ -27,7 +27,7 @@ module Host::ManagedExtensions
   end
 
   def setReboot
-    old.becomes(Host::Discovered).reboot(old.ip, ip)
+    old.becomes(Host::Discovered).reboot(old.ip, ip, old.ip6, ip6)
     # 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.ip, ip)
+    old.becomes(Host::Discovered).kexec(render_kexec_template.to_json, old.ip, ip, old.ip6, ip6)
     true
   rescue ::Foreman::Exception => e
     Foreman::Logging.exception("Unable to kexec", e)

data/app/models/setting/discovered.rb

@@ -37,6 +37,7 @@ class Setting::Discovered < ::Setting
       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
 

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

@@ -11,5 +11,5 @@
   <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-  <%= react_component('DiscoveredHosts', docUrl: discovery_doc_url ) %>
+  <%= react_component('DiscoveredHosts', docUrl: external_link_path(type: 'plugin_manual', name: 'foreman_discovery', version: discovery_doc_version)) %>
 <% end %>

data/app/views/discovery_rules/welcome.html.erb

@@ -11,5 +11,5 @@
   <%= notifications %>
   <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
   <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-  <%= react_component('DiscoveryRules', docUrl: discovery_doc_url + '/#4.3Automaticprovisioning' ) %>
+  <%= react_component('DiscoveryRules', docUrl: external_link_path(type: 'plugin_manual', name: 'foreman_discovery', version: discovery_doc_version, section: '#4.3Automaticprovisioning') ) %>
 <% end %>

data/app/views/foreman_discovery/debian_kexec.erb

@@ -19,7 +19,7 @@ Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']
-  bootif = host_param("hardware_type", "01") + mac.gsub(':', '-') if mac
+  bootif = host_param("hardware_type", "01") + '-' + mac.gsub(':', '-') if mac
   ip_cidr = @host.facts['discovery_ip_cidr']
   ip = @host.facts['discovery_ip']
   mask = @host.facts['discovery_netmask']

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -29,7 +29,7 @@ Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']
-  bootif = host_param("hardware_type", "01") + mac.gsub(':', '-') if mac
+  bootif = host_param("hardware_type", "01") + '-' + mac.gsub(':', '-') if mac
   ip_cidr = @host.facts['discovery_ip_cidr']
   ip = @host.facts['discovery_ip']
   mask = @host.facts['discovery_netmask']

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "17.0.0"
+  VERSION = "17.0.4"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -3,15 +3,15 @@
 # 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
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 17.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 08:46+0200\n"
-"PO-Revision-Date: 2021-01-25 08:35+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2021-09-20 17:25+0200\n"
+"PO-Revision-Date: 2021-05-03 08:29+0000\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgstr ""
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:157
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../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}"
 
@@ -128,7 +128,7 @@ msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "No es pot aprovisionar a %{host}: %{errors}"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:164
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../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"
 
@@ -136,11 +136,11 @@ msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 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:156 ../app/controllers/discovered_hosts_controller.rb:170
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../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:159 ../app/controllers/discovered_hosts_controller.rb:173
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:176
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -160,7 +160,7 @@ msgstr "S'està reiniciant un amfitrió descobert"
 msgid "Rebooting all discovered hosts"
 msgstr "S'estan reiniciant tots els amfitrions descoberts"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:126
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -240,75 +240,75 @@ msgstr "Errors durant el reinici: %s"
 msgid "No discovered hosts to reboot"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:60
+#: ../app/controllers/discovered_hosts_controller.rb:63
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:94
+#: ../app/controllers/discovered_hosts_controller.rb:97
 msgid "Facts refreshed for %s"
 msgstr "Els objectes d'interès que s'han refrescat per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:96
+#: ../app/controllers/discovered_hosts_controller.rb:99
 msgid "Failed to refresh facts for %s"
 msgstr "No s'ha pogut refrescar els objectes d'interès per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:99
+#: ../app/controllers/discovered_hosts_controller.rb:102
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:106
+#: ../app/controllers/discovered_hosts_controller.rb:109
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:110
+#: ../app/controllers/discovered_hosts_controller.rb:113
 msgid "Rebooting host %s"
 msgstr "S'està reiniciant l'amfitrió %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:112
+#: ../app/controllers/discovered_hosts_controller.rb:115
 msgid "Failed to reboot host %s"
 msgstr "No s'ha pogut reiniciar l'amfitrió %s."
 
-#: ../app/controllers/discovered_hosts_controller.rb:115
+#: ../app/controllers/discovered_hosts_controller.rb:118
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:129
+#: ../app/controllers/discovered_hosts_controller.rb:132
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:147
+#: ../app/controllers/discovered_hosts_controller.rb:150
 msgid "Destroyed selected hosts"
 msgstr "S'han destruït els amfitrions seleccionats"
 
-#: ../app/controllers/discovered_hosts_controller.rb:149
+#: ../app/controllers/discovered_hosts_controller.rb:152
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:161
+#: ../app/controllers/discovered_hosts_controller.rb:164
 msgid "Failed to auto provision host %s: %s"
 msgstr "No s'ha pogut auto aprovisionar l'amfitrió %s: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:189
+#: ../app/controllers/discovered_hosts_controller.rb:192
 msgid "Discovered hosts are provisioning now"
 msgstr "Els amfitrions descoberts ara tenen aprovisionament"
 
-#: ../app/controllers/discovered_hosts_controller.rb:270
+#: ../app/controllers/discovered_hosts_controller.rb:277
 msgid "Discovered host reported from unknown subnet, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:275
+#: ../app/controllers/discovered_hosts_controller.rb:282
 msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:289
+#: ../app/controllers/discovered_hosts_controller.rb:296
 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:293
+#: ../app/controllers/discovered_hosts_controller.rb:300
 msgid "No hosts selected"
 msgstr "Cap amfitrió seleccionat"
 
-#: ../app/controllers/discovered_hosts_controller.rb:299
+#: ../app/controllers/discovered_hosts_controller.rb:306
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
 
@@ -406,7 +406,7 @@ msgstr ""
 
 #: ../app/helpers/discovery_rules_helper.rb:33
 msgid "Clone"
-msgstr ""
+msgstr "Clona"
 
 #: ../app/helpers/discovery_rules_helper.rb:34
 msgid "Delete rule '%s'?"
@@ -472,23 +472,23 @@ msgstr ""
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:146
+#: ../app/models/host/discovered.rb:155
 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:160
+#: ../app/models/host/discovered.rb:173
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
+#: ../app/models/host/discovered.rb:177 ../app/models/host/discovered.rb:200
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:179
+#: ../app/models/host/discovered.rb:196
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:203
+#: ../app/models/host/discovered.rb:220
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -696,6 +696,14 @@ msgstr ""
 msgid "Type of name generator"
 msgstr ""
 
+#: ../app/models/setting/discovered.rb:40
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:40
+msgid "Prefer IPv6"
+msgstr ""
+
 #: ../app/services/foreman_discovery/fact_parser.rb:4
 msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
 msgstr ""
@@ -976,7 +984,7 @@ msgstr ""
 
 #: ../app/views/discovery_rules/clone.erb:1
 msgid "Clone %s"
-msgstr ""
+msgstr "Clona %s"
 
 #: ../app/views/discovery_rules/edit.html.erb:1
 msgid "Edit %s"
@@ -1089,7 +1097,3 @@ msgstr ""
 #: action_names.rb:5
 msgid "Action with sub plans"
 msgstr ""
-
-#: ../app/helpers/discovered_hosts_helper.rb:10
-#~ msgid "%s ago"
-#~ msgstr "fa %s"

data/locale/de/foreman_discovery.edit.po

@@ -14,11 +14,11 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 16.3.4\n"
+"Project-Id-Version: foreman_discovery 17.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 08:46+0200\n"
-"PO-Revision-Date: 2021-01-25 08:35+0000\n"
-"Last-Translator: Crited <Alexander.Stoll@netways.de>\n"
+"POT-Creation-Date: 2021-09-20 17:25+0200\n"
+"PO-Revision-Date: 2021-05-03 08:29+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\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"
@@ -126,7 +126,7 @@ msgstr "Hash, der Fakten für den Host mit minimaler Anzahl an Fakten enthält:
 msgid "Execute rules against a discovered host"
 msgstr "Regeln auf einem entdeckten Host anwenden"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:157
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:136 ../app/controllers/discovered_hosts_controller.rb:160
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "Host %{host} wurde bereitgestellt mit Regel %{rule}"
 
@@ -134,7 +134,7 @@ msgstr "Host %{host} wurde bereitgestellt mit Regel %{rule}"
 msgid "Unable to provision %{host}: %{errors}"
 msgstr "%{host} kann nicht bereitgestellt werden: %{errors} "
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:164
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:167
 msgid "No rule found for host %s"
 msgstr "Keine Regel gefunden für Host %s"
 
@@ -142,11 +142,11 @@ msgstr "Keine Regel gefunden für Host %s"
 msgid "Execute rules against all currently discovered hosts"
 msgstr "Regeln auf allen kürzlich entdeckten Hosts anwenden"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:170
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:156 ../app/controllers/discovered_hosts_controller.rb:173
 msgid "Errors during auto provisioning: %s"
 msgstr "Fehler bei automatischer Bereitstellung: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:173
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:159 ../app/controllers/discovered_hosts_controller.rb:176
 msgid "No discovered hosts to provision"
 msgstr "Keine entdeckten Hosts zur Bereitstellung"
 
@@ -166,7 +166,7 @@ msgstr "Entdeckten Host neu starten"
 msgid "Rebooting all discovered hosts"
 msgstr "Alle entdeckten Hosts neu starten"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:126
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:221 ../app/controllers/discovered_hosts_controller.rb:129
 msgid "Discovered hosts are rebooting now"
 msgstr "Entdeckte Hosts werden jetzt neu gestartet"
 
@@ -246,75 +246,75 @@ msgstr "Fehler bei Neustart: %s"
 msgid "No discovered hosts to reboot"
 msgstr "Keine entdeckten Hosts zum Neustarten"
 
-#: ../app/controllers/discovered_hosts_controller.rb:60
+#: ../app/controllers/discovered_hosts_controller.rb:63
 msgid "Successfully provisioned %s"
 msgstr "%s erfolgreich bereitgestellt"
 
-#: ../app/controllers/discovered_hosts_controller.rb:94
+#: ../app/controllers/discovered_hosts_controller.rb:97
 msgid "Facts refreshed for %s"
 msgstr "Fakten für %s erneuert"
 
-#: ../app/controllers/discovered_hosts_controller.rb:96
+#: ../app/controllers/discovered_hosts_controller.rb:99
 msgid "Failed to refresh facts for %s"
 msgstr "Fehler beim Aktualisieren von Fakten für %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:99
+#: ../app/controllers/discovered_hosts_controller.rb:102
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr "Fehler beim Aktualisieren der Fakten für %{hostname} mit Fehlermeldung %{error_message}"
 
-#: ../app/controllers/discovered_hosts_controller.rb:106
+#: ../app/controllers/discovered_hosts_controller.rb:109
 msgid "Host of type %s can not be rebooted"
 msgstr "Host vom Typ %s kann nicht neu gestartet werden"
 
-#: ../app/controllers/discovered_hosts_controller.rb:110
+#: ../app/controllers/discovered_hosts_controller.rb:113
 msgid "Rebooting host %s"
 msgstr "Host %s wird neu gestartet"
 
-#: ../app/controllers/discovered_hosts_controller.rb:112
+#: ../app/controllers/discovered_hosts_controller.rb:115
 msgid "Failed to reboot host %s"
 msgstr "Fehler beim Neustart von Host %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:115
+#: ../app/controllers/discovered_hosts_controller.rb:118
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr "Fehler beim Neustart von Host %{hostname} mit Fehlermeldung %{error_message}"
 
-#: ../app/controllers/discovered_hosts_controller.rb:129
+#: ../app/controllers/discovered_hosts_controller.rb:132
 msgid "Failed to reboot hosts with error %s"
 msgstr "Neustart von Hosts fehlgeschlagen mit Fehler %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:147
+#: ../app/controllers/discovered_hosts_controller.rb:150
 msgid "Destroyed selected hosts"
 msgstr "Ausgewählte Hosts gelöscht"
 
-#: ../app/controllers/discovered_hosts_controller.rb:149
+#: ../app/controllers/discovered_hosts_controller.rb:152
 msgid "The following hosts were not deleted: %s"
 msgstr "Die folgenden Hosts wurden nicht gelöscht: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:161
+#: ../app/controllers/discovered_hosts_controller.rb:164
 msgid "Failed to auto provision host %s: %s"
 msgstr "Fehler bei automatischer Bereitstellung von Host %s: %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:189
+#: ../app/controllers/discovered_hosts_controller.rb:192
 msgid "Discovered hosts are provisioning now"
 msgstr "Entdeckte Hosts, die jetzt bereitgestellt werden"
 
-#: ../app/controllers/discovered_hosts_controller.rb:270
+#: ../app/controllers/discovered_hosts_controller.rb:277
 msgid "Discovered host reported from unknown subnet, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:275
+#: ../app/controllers/discovered_hosts_controller.rb:282
 msgid "Discovered hosts reported from unknown subnet are %s, communication will not be proxied."
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:289
+#: ../app/controllers/discovered_hosts_controller.rb:296
 msgid "No hosts were found with that id or name"
 msgstr "Keine Systeme mit dieser ID oder diesem Namen gefunden"
 
-#: ../app/controllers/discovered_hosts_controller.rb:293
+#: ../app/controllers/discovered_hosts_controller.rb:300
 msgid "No hosts selected"
 msgstr "Keine Hosts ausgewählt"
 
-#: ../app/controllers/discovered_hosts_controller.rb:299
+#: ../app/controllers/discovered_hosts_controller.rb:306
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Fehler beim Auswählen der Hosts – %s"
 
@@ -412,7 +412,7 @@ msgstr "Regel '%s' aktivieren?"
 
 #: ../app/helpers/discovery_rules_helper.rb:33
 msgid "Clone"
-msgstr ""
+msgstr "Klonen"
 
 #: ../app/helpers/discovery_rules_helper.rb:34
 msgid "Delete rule '%s'?"
@@ -478,23 +478,23 @@ msgstr ""
 msgid "Facts could not be imported"
 msgstr "Fakten konnten nicht importiert werden"
 
-#: ../app/models/host/discovered.rb:146
+#: ../app/models/host/discovered.rb:155
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Fakten konnten nicht vom Proxy %{url} abgerufen werden: %{error}"
 
-#: ../app/models/host/discovered.rb:160
+#: ../app/models/host/discovered.rb:173
 msgid "Unable to perform reboot on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:164 ../app/models/host/discovered.rb:183
+#: ../app/models/host/discovered.rb:177 ../app/models/host/discovered.rb:200
 msgid "Unable to perform %{action} on %{ips}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:179
+#: ../app/models/host/discovered.rb:196
 msgid "Unable to perform kexec on %{name} (%{url}): %{msg}"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:203
+#: ../app/models/host/discovered.rb:220
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr "Ungültiger Hostname: Konnte den Hostnamen nicht normalisieren"
 
@@ -702,6 +702,14 @@ msgstr ""
 msgid "Type of name generator"
 msgstr "Typ des Namensgenerators"
 
+#: ../app/models/setting/discovered.rb:40
+msgid "Prefer IPv6 to IPv4 when calling discovered nodes"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:40
+msgid "Prefer IPv6"
+msgstr ""
+
 #: ../app/services/foreman_discovery/fact_parser.rb:4
 msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
 msgstr ""
@@ -982,7 +990,7 @@ msgstr ""
 
 #: ../app/views/discovery_rules/clone.erb:1
 msgid "Clone %s"
-msgstr ""
+msgstr "%s klonen"
 
 #: ../app/views/discovery_rules/edit.html.erb:1
 msgid "Edit %s"
@@ -1095,7 +1103,3 @@ msgstr "Fakten importieren"
 #: action_names.rb:5
 msgid "Action with sub plans"
 msgstr "Aktion mit Unterplänen"
-
-#: ../app/helpers/discovered_hosts_helper.rb:10
-#~ msgid "%s ago"
-#~ msgstr "vor %s"