foreman_discovery 15.0.0 → 15.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 305477b201b75199eef688c2bea65f1a514d556b106315c2fd0f654584e70a29
-  data.tar.gz: c5326ee72b7fea7a727eae0307b9c10242b0ff9f9cc24ff75dfc4ca7fd914a89
+  metadata.gz: 6616fcb141c9b34f56d2878914d9aa3fa32d6338b4a665db8264c5b265c352fb
+  data.tar.gz: d4e1f3143cf169b12af2dd77210c248d86722125dfa1b3aec0872d6991bf0586
 SHA512:
-  metadata.gz: 806df7387b0d27b0ff717a9e882f8ab235585bce379b8fbe1e009936b9663b87e4a19d9211c5cc8beea1ddce5f97469ab6ebaeac81d6886a6479a92e31454dfc
-  data.tar.gz: 88b1b13517df83ce74a27d07a38e946db6330182f37a4e4ab98dec82afcd34a3704ffa1c4868e8d87c07b601232dd3ebc950ab3098d9c589ee0080e3e867abfa
+  metadata.gz: 40b39fc7f5de86598c4b401eaac38a21ce0694f6aaf955e7a1263605ac27177089e64c06ef9c6a3e9157e63c8eae6ee1d4185c77fe1968084b5a005b56837ce0
+  data.tar.gz: 6673f071cab3e4380454d86b6c5697825afd23ffeee63e0baaa0be30ee271b34c491782dbfe6034d8c3935a5c70590c7a1c82d37cb8cbb989b4fc71ae4157030

data/app/models/discovery_attribute_set.rb

@@ -3,5 +3,4 @@ class DiscoveryAttributeSet < ApplicationRecord
 
   validates :cpu_count, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :memory, :presence => true,    :numericality => {:greater_than_or_equal_to => 0}
-  validates :host, :presence => true
 end

data/app/models/host/discovered.rb

@@ -9,8 +9,7 @@ class Host::Discovered < ::Host::Base
   include ::Hostext::OperatingSystem
 
   has_one :discovery_attribute_set, :foreign_key => :host_id, :dependent => :destroy
-
-  validates :discovery_attribute_set, :presence => true
+  validates_associated :discovery_attribute_set
 
   delegate :memory, :cpu_count, :disk_count, :disks_size, :to => :discovery_attribute_set, :allow_nil => true
   after_destroy :delete_notification

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

@@ -3,8 +3,15 @@ module ForemanDiscovery
   module ImportHooks
     class DiscoveryAttribute < ImportHook
       def after_populate
-        host.discovery_attribute_set = DiscoveryAttributeSet.where(host_id: host.id).first_or_create
-        host.discovery_attribute_set.update(import_from_facts)
+        # This should be done in a SQL transaction but we cannot use transactions for
+        # host updates because it utterly breaks our orchestration. We must work with
+        # the fact that discovery_attribute_set can end up being nil and controllers
+        # and views must be aware and render zero/blank values.
+        if host.discovery_attribute_set
+          host.discovery_attribute_set.update(import_from_facts)
+        else
+          host.build_discovery_attribute_set(import_from_facts)
+        end
       end
 
       def import_from_facts

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "15.0.0"
+  VERSION = "15.0.1"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -1,18 +1,19 @@
 # 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 14.0.0\n"
+"Project-Id-Version: foreman_discovery 15.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-18 13:34+0200\n"
+"POT-Creation-Date: 2019-07-23 17:13+0200\n"
 "PO-Revision-Date: 2019-04-18 19:36+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
-"Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\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 +24,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 +44,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:79
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
@@ -69,14 +65,11 @@ 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"
+msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 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"
+msgid "required if value is not inherited from host group or default password in settings"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:89
@@ -88,18 +81,14 @@ 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)"
+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
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122
-#: ../app/controllers/discovered_hosts_controller.rb:159
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:122 ../app/controllers/discovered_hosts_controller.rb:159
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
@@ -107,8 +96,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:131
-#: ../app/controllers/discovered_hosts_controller.rb:166
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:131 ../app/controllers/discovered_hosts_controller.rb:166
 msgid "No rule found for host %s"
 msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 
@@ -116,13 +104,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:142
-#: ../app/controllers/discovered_hosts_controller.rb:172
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:142 ../app/controllers/discovered_hosts_controller.rb:172
 msgid "Errors during auto provisioning: %s"
 msgstr "Erros durant l'auto aprovisionament: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145
-#: ../app/controllers/discovered_hosts_controller.rb:175
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:145 ../app/controllers/discovered_hosts_controller.rb:175
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -142,8 +128,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:207
-#: ../app/controllers/discovered_hosts_controller.rb:128
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:207 ../app/controllers/discovered_hosts_controller.rb:128
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -168,8 +153,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 +161,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
@@ -329,21 +312,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:38
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/helpers/discovered_hosts_helper.rb:29 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:37
 msgid "Auto Provision"
 msgstr "Auto aprovisiona"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:38
 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:26
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/helpers/discovered_hosts_helper.rb:30 ../app/models/setting/discovered.rb:26 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:39
 msgid "Reboot"
 msgstr "Reinicia"
 
@@ -351,13 +328,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:41
+#: ../app/helpers/discovered_hosts_helper.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:40
 msgid "Delete %s?"
 msgstr "Voleu suprimir %s?"
 
@@ -377,8 +352,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 +372,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:2
-#: ../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:1 ../app/views/discovered_hosts/welcome.html.erb:6 ../lib/foreman_discovery/engine.rb:158 ../lib/foreman_discovery/engine.rb:173
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -452,65 +421,58 @@ 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] ""
 
-#: ../app/models/host/discovered.rb:41
+#: ../app/models/host/discovered.rb:40
 msgid "Fact + prefix"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:42
+#: ../app/models/host/discovered.rb:41
 msgid "Random name"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:43
+#: ../app/models/host/discovered.rb:42
 msgid "MAC-based name"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:52
+#: ../app/models/host/discovered.rb:51
 msgid "Invalid facts, must be a Hash"
 msgstr "Objectes d'interès no vàlids, han de tenir un Hash"
 
-#: ../app/models/host/discovered.rb:57
-msgid ""
-"Expected discovery_fact '%s' is missing, unable to detect primary interface "
-"and set hostname"
+#: ../app/models/host/discovered.rb:56
+msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:70
-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:69
+msgid "Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:96
+#: ../app/models/host/discovered.rb:95
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:151
+#: ../app/models/host/discovered.rb:150
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "No s'han pogut obtenir els objectes d'interès del servidor intermediari %{url}: %{error}"
 
-#: ../app/models/host/discovered.rb:159
+#: ../app/models/host/discovered.rb:158
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr "No es pot reiniciar %{name} a través de %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:167
+#: ../app/models/host/discovered.rb:166
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "No es pot realitzar kexec a %{name} a través de %{url}: %{msg}"
 
-#: ../app/models/host/discovered.rb:186
+#: ../app/models/host/discovered.rb:185
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -526,11 +488,11 @@ msgstr "S'està reiniciant %s"
 msgid "Kexec template not associated with operating system"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:51
+#: ../app/models/host/managed_extensions.rb:49
 msgid "Kernel kexec URL is invalid: '%s'"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:52
+#: ../app/models/host/managed_extensions.rb:50
 msgid "Init RAM kexec URL is invalid: '%s'"
 msgstr ""
 
@@ -563,9 +525,7 @@ msgid "Interface fact"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:22
-msgid ""
-"Automatic bond interface (if another interface is detected on the same VLAN "
-"via LLDP)"
+msgid "Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:22
@@ -589,9 +549,7 @@ msgid "Hostname facts"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:25
-msgid ""
-"Automatically provision newly discovered hosts, according to the "
-"provisioning rules"
+msgid "Automatically provision newly discovered hosts, according to the provisioning rules"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:25
@@ -667,9 +625,7 @@ msgid "IPMI facts"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:35
-msgid ""
-"Automatically generate PXE configuration to pin a newly discovered host to "
-"discovery"
+msgid "Automatically generate PXE configuration to pin a newly discovered host to discovery"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:35
@@ -709,9 +665,7 @@ msgid "Force DNS"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:40
-msgid ""
-"Do not allow to discover existing managed host matching MAC of a "
-"provisioning NIC (errors out early)"
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:40
@@ -735,9 +689,7 @@ 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/node_api/node_resource.rb:75
@@ -756,25 +708,15 @@ msgstr ""
 msgid "Host"
 msgstr "Amfitrió"
 
-#: ../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
+#: ../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
 msgid "Model"
 msgstr "Model"
 
-#: ../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
+#: ../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
 msgid "CPUs"
 msgstr "Les CPU"
 
-#: ../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
+#: ../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
 msgid "Memory"
 msgstr "Memòria"
 
@@ -786,67 +728,59 @@ msgstr ""
 msgid "Create Host"
 msgstr "Crea un amfitrió"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
 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:5
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:4
 msgid "items selected. Uncheck to Clear"
 msgstr "ítems seleccionats. Desmarca per netejar"
 
-#: ../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
+#: ../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
 msgid "Name"
 msgstr "Nom"
 
-#: ../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
+#: ../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
 msgid "IP Address"
 msgstr "Adreça IP"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:10
 msgid "Disk Count"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11
 msgid "Disks Size"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:9
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:15 ../app/views/discovered_hosts/_selected_hosts.html.erb:9
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:10
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:16 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
 msgid "Organization"
 msgstr "Organització"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:17
 msgid "Subnet"
 msgstr "Subxarxa"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:18
 msgid "Last Facts Upload"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
-#: ../app/views/discovery_rules/index.html.erb:12
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:19 ../app/views/discovery_rules/index.html.erb:12
 msgid "Actions"
 msgstr "Accions"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:52
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:51
 msgid "Please Confirm"
 msgstr "Si us plau, confirmeu"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:57
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:59
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:58
 msgid "Submit"
 msgstr "Envia"
 
@@ -855,9 +789,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
@@ -901,9 +833,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."
+msgid "This page shows discovered bare-metal or virtual nodes waiting to be provisioned."
 msgstr ""
 
 #: ../app/views/discovered_hosts/welcome.html.erb:9
@@ -918,23 +848,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"
 
@@ -983,41 +909,30 @@ 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:163
 msgid "Discovery Rules"
 msgstr "Regles de descobriment"
 
@@ -1082,13 +997,9 @@ msgid "Discovery Proxy"
 msgstr ""
 
 #: ../lib/foreman_discovery/engine.rb:189
-msgid ""
-"Discovery Proxy to use within this subnet for managing connection to "
-"discovered hosts"
+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"
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
 msgstr ""