foreman_discovery 10.0.0 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d782b90e35570098b6d74636a5a79a6a7f94026a
-  data.tar.gz: '07791a0d0a62b65eb04803473e2413748458b40a'
+  metadata.gz: 221ad5eb42c9d10c313e6e827beb5d0156a56275
+  data.tar.gz: 6b6df98bf5b4611aeb3734152b5463c2edef7453
 SHA512:
-  metadata.gz: 3172b396efe8c2b9a7a8727bc26739bcbfb4da40cd0fc1222ad4c2cd91267de873d61ef3c4fdc2e7e6cbf44881679c79b990b9ed795f699150ecb8f806d7aa3b
-  data.tar.gz: a8daeeadb503811032caebe4f2c6dd26acad998d615b7e3deeb96dff59880494ba7ce01cd9459431adcc439e7a13ab91a24ca467b2774b54a4c4265a31c2b17f
+  metadata.gz: 4a67ce08394ba37b05dba6947d2bfc2ccd0de5ab13ded18dc208ce29b7ec069634ba68a42611b17a7987c90f013540d94e136b06a553764192df9b07e29bd237
+  data.tar.gz: 8f57149cce4c007f15858483c9aaf3bb9dac723c2e5a544aef8a94662e1b7f064c777442e9f69596d39152ace62a9a92fd8ca4c097448283bf5f57bbbafbad2c

data/README.md

@@ -4,7 +4,7 @@ This plugin enables MaaS hardware discovery in Foreman.
 
 # Documentation
 
-The main documentation can be found in the [Foreman Discovery manual] (http://theforeman.org/plugins/foreman_discovery/).
+The main documentation can be found in the [Foreman Discovery manual](http://theforeman.org/plugins/foreman_discovery/).
 
 ## Latest code
 

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

@@ -80,7 +80,7 @@ module Api
       end
 
       def update
-        @host = ::ForemanDiscovery::HostConverter.to_managed(@discovered_host, true, true, discovered_host_params)
+        @host = ::ForemanDiscovery::HostConverter.to_managed(@discovered_host, true, true, managed_host_params)
         forward_request_url
         update_response = @host.save
         process_response update_response

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

@@ -36,7 +36,8 @@ module Api
           param :max_count, Integer, :desc => N_("enables to limit maximum amount of provisioned hosts per rule")
           param :priority, Integer, :desc => N_("puts the rules in order, low numbers go first. Must be greater then zero")
           param :enabled, :bool, :desc => N_("flag is used for temporary shutdown of rules")
-          param_group :taxonomies, ::Api::V2::BaseController
+          param :location_ids, Array, :required => true, :desc => N_("location ID for provisioned hosts") if SETTINGS[:locations_enabled]
+          param :organization_ids, Array, :required => true, :desc => N_("organization ID for provisioned hosts") if SETTINGS[:organizations_enabled]
         end
       end
 

data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb

@@ -1,7 +1,6 @@
 module Foreman::Controller::Parameters::DiscoveredHost
   extend ActiveSupport::Concern
-  include Foreman::Controller::Parameters::HostBase
-  include Foreman::Controller::Parameters::HostCommon
+  include Foreman::Controller::Parameters::Host
 
   class_methods do
     def discovered_host_params_filter
@@ -21,4 +20,12 @@ module Foreman::Controller::Parameters::DiscoveredHost
   def discovered_host_params_host
     self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
   end
+
+  def managed_host_params_host
+    self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+  end
+
+  def managed_host_params
+    self.class.host_params_filter.filter_params(params, parameter_filter_context)
+  end
 end

data/app/controllers/discovered_hosts_controller.rb

@@ -55,7 +55,7 @@ class DiscoveredHostsController < ::ApplicationController
 
   def edit
     @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false, discovered_host_params_host) unless @host.nil?
-    setup_host_class_variables(@host)
+    setup_host_class_variables
     @override_taxonomy = true
     if params[:quick_submit]
       perform_update(@host, _('Successfully provisioned %s') % @host.name)
@@ -66,7 +66,7 @@ class DiscoveredHostsController < ::ApplicationController
   end
 
   def update
-    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, true, discovered_host_params_host)
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, true, managed_host_params_host)
     forward_url_options
 
     perform_update(@host)
@@ -135,10 +135,8 @@ class DiscoveredHostsController < ::ApplicationController
 
   def submit_multiple_destroy
     # keep all the ones that were not deleted for notification.
-    @hosts.to_a.delete_if {|host| host.destroy}
-
-    missed_hosts = @hosts.map(&:name).join('<br/>')
-    if @hosts.empty?
+    missed_hosts = @hosts.select {|host| !host.destroy }
+    if missed_hosts
       notice _("Destroyed selected hosts")
     else
       error _("The following hosts were not deleted: %s") % missed_hosts
@@ -189,15 +187,18 @@ class DiscoveredHostsController < ::ApplicationController
 
   private
 
-  def setup_host_class_variables(host)
-    if host.hostgroup
-      @architecture    = host.hostgroup.architecture
-      @operatingsystem = host.hostgroup.operatingsystem
-      @environment     = host.hostgroup.environment
-      @domain          = host.hostgroup.domain
-      @subnet          = host.hostgroup.subnet
-      @compute_profile = host.hostgroup.compute_profile
-      @realm           = host.hostgroup.realm
+  def setup_host_class_variables
+    if @host.hostgroup
+      @architecture    = @host.hostgroup.architecture
+      @operatingsystem = @host.hostgroup.operatingsystem
+      @environment     = @host.hostgroup.environment
+      @domain          = @host.hostgroup.domain
+      @subnet          = @host.hostgroup.subnet
+      @compute_profile = @host.hostgroup.compute_profile
+      @realm           = @host.hostgroup.realm
+      @host.interfaces.first.assign_attributes(subnet: @subnet,
+                                               domain: @domain)
+      @host.environment = @environment
     end
   end
 

data/app/controllers/discovery_rules_controller.rb

@@ -8,7 +8,7 @@ class DiscoveryRulesController < ApplicationController
 
   def index
     base = resource_base.search_for(params[:search], :order => (params[:order]))
-    @discovery_rules = base.paginate(:page => params[:page]).includes(:hostgroup)
+    @discovery_rules = base.paginate(:page => params[:page], :per_page => params[:per_page]).includes(:hostgroup)
   end
 
   def new

data/app/models/host/discovered.rb

@@ -14,14 +14,20 @@ class Host::Discovered < ::Host::Base
   after_destroy :delete_notification
 
   scoped_search :on => :name, :complete_value => true
-  scoped_search :on => :created_at, :default_order => :desc
-  scoped_search :on => :last_report, :complete_value => true
+  scoped_search :on => :created_at, :default_order => :desc, :only_explicit => true
+  scoped_search :on => :last_report, :complete_value => true, :only_explicit => true
   scoped_search :relation => :primary_interface, :on => :ip, :complete_value => true
   scoped_search :relation => :primary_interface, :on => :mac, :complete_value => true
   scoped_search :relation => :model, :on => :name, :complete_value => true, :rename => :model
   scoped_search :relation => :fact_values, :on => :value, :in_key => :fact_names, :on_key => :name, :rename => :facts, :complete_value => true, :only_explicit => true
-  scoped_search :relation => :location, :on => :name, :rename => :location, :complete_value => true         if SETTINGS[:locations_enabled]
-  scoped_search :relation => :organization, :on => :name, :rename => :organization, :complete_value => true if SETTINGS[:organizations_enabled]
+  if SETTINGS[:locations_enabled]
+    scoped_search :relation => :location, :on => :name, :rename => :location, :complete_value => true, :only_explicit => true
+    scoped_search :on => :location_id, :complete_value => false, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+  end
+  if SETTINGS[:organizations_enabled]
+    scoped_search :relation => :organization, :on => :name, :rename => :organization, :complete_value => true, :only_explicit => true
+    scoped_search :on => :organization_id, :complete_value => false, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+  end
   scoped_search :relation => :subnet, :on => :network, :complete_value => true, :rename => :subnet
   scoped_search :relation => :subnet, :on => :name, :complete_value => true, :rename => 'subnet.name'
   scoped_search :relation => :discovery_attribute_set, :on => :cpu_count, :rename => :cpu_count, :complete_value => true, :only_explicit => true

data/app/models/host/managed_extensions.rb

@@ -12,7 +12,10 @@ module Host::ManagedExtensions
   end
 
   def queue_reboot
-    return unless errors.empty? && Setting[:discovery_reboot]
+    unless errors.empty? && Setting[:discovery_reboot]
+      logger.warn("Not queueing Discovery reboot: #{errors.full_messages.to_sentence}")
+      return
+    end
     return if new_record? # Discovered Hosts already exist, and new_records will break `find`
     return unless type_changed? and ::Host::Base.find(self.id).type == "Host::Discovered"
     # reboot task must be high priority and there is no compensation action apparently

data/app/views/foreman_discovery/debian_kexec.erb

@@ -18,7 +18,7 @@ Please read kexec(8) man page for more information about semantics.
 -%>
 <%
   mac = @host.facts['discovery_bootif']
-  bootif = '00-' + mac.gsub(':', '-') rescue ''
+  bootif = '00-' + mac.gsub(':', '-') if mac
   ip_cidr = @host.facts['discovery_ip_cidr']
   ip = @host.facts['discovery_ip']
   mask = @host.facts['discovery_netmask']

data/db/migrate/20141107091416_create_discovery_rules.rb

@@ -1,4 +1,4 @@
-class CreateDiscoveryRules < ActiveRecord::Migration
+class CreateDiscoveryRules < ActiveRecord::Migration[4.2]
   def change
     create_table :discovery_rules do |t|
       t.string :name, :length => 254

data/db/migrate/20141107091417_add_discovery_rule_to_host.rb

@@ -1,4 +1,4 @@
-class AddDiscoveryRuleToHost < ActiveRecord::Migration
+class AddDiscoveryRuleToHost < ActiveRecord::Migration[4.2]
   def self.up
     add_column :hosts, :discovery_rule_id, :integer
   end

data/db/migrate/20141126165451_add_discovery_id_to_subnet.rb

@@ -1,4 +1,4 @@
-class AddDiscoveryIdToSubnet < ActiveRecord::Migration
+class AddDiscoveryIdToSubnet < ActiveRecord::Migration[4.2]
   def self.up
     add_column :subnets, :discovery_id, :integer
   end

data/db/migrate/20141223101707_create_discovery_attribute_sets.rb

@@ -1,4 +1,4 @@
-class CreateDiscoveryAttributeSets < ActiveRecord::Migration
+class CreateDiscoveryAttributeSets < ActiveRecord::Migration[4.2]
   def change
     create_table :discovery_attribute_sets do |t|
       t.references :host

data/db/migrate/20141223142759_fill_discovery_attribute_sets_for_existing_hosts.rb

@@ -2,7 +2,7 @@ class FakeDiscoveredHost < ApplicationRecord
   self.table_name = 'hosts'
 end
 
-class FillDiscoveryAttributeSetsForExistingHosts < ActiveRecord::Migration
+class FillDiscoveryAttributeSetsForExistingHosts < ActiveRecord::Migration[4.2]
   def up
     FakeDiscoveredHost.where(:type => "Host::Discovered").all.each do |host|
       begin

data/db/migrate/20150302112545_remove_duplicate_tokens_from_hosts.rb

@@ -1,4 +1,4 @@
-class RemoveDuplicateTokensFromHosts < ActiveRecord::Migration
+class RemoveDuplicateTokensFromHosts < ActiveRecord::Migration[4.2]
   def up
     Token.where('id not in (?)', Host::Managed.all.map(&:token).compact).delete_all
   end

data/db/migrate/20150310153859_remove_discovery_attribute_sets_from_managed_hosts.rb

@@ -1,4 +1,4 @@
-class RemoveDiscoveryAttributeSetsFromManagedHosts < ActiveRecord::Migration
+class RemoveDiscoveryAttributeSetsFromManagedHosts < ActiveRecord::Migration[4.2]
   def up
     DiscoveryAttributeSet.where(:id => DiscoveryAttributeSet.joins(:host).where(:'hosts.managed' => true).pluck("#{DiscoveryAttributeSet.table_name}.id")).delete_all
   end

data/db/migrate/20150331132115_remove_old_permissions.rb

@@ -1,4 +1,4 @@
-class RemoveOldPermissions < ActiveRecord::Migration
+class RemoveOldPermissions < ActiveRecord::Migration[4.2]
   def up
     # remove invalid permissions causing http://projects.theforeman.org/issues/9963
     perms = Permission.where("name like '%_discovered_hosts' and resource_type is null").destroy_all

data/db/migrate/20150505111345_remove_leftover_tokens.rb

@@ -1,4 +1,4 @@
-class RemoveLeftoverTokens < ActiveRecord::Migration
+class RemoveLeftoverTokens < ActiveRecord::Migration[4.2]
   def up
     existing_tokens = Host::Managed.all.map(&:token).compact
     if existing_tokens.empty?

data/db/migrate/20150512150432_remove_old_discovery_reader_permissions.rb

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

data/db/migrate/20150714144500_review_discovery_permissions.rb

@@ -1,4 +1,4 @@
-class ReviewDiscoveryPermissions < ActiveRecord::Migration
+class ReviewDiscoveryPermissions < ActiveRecord::Migration[4.2]
   def up
     Role.ignore_locking do
       if (mgr = Role.find_by_name("Discovery Manager"))

data/db/migrate/20151023144501_regenerate_red_hat_kexec.rb

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

data/db/migrate/20160719124942_add_missing_view_permissions.rb

@@ -1,4 +1,4 @@
-class AddMissingViewPermissions < ActiveRecord::Migration
+class AddMissingViewPermissions < ActiveRecord::Migration[4.2]
   def up
     # migration renamed to db/migrate/20160818091421_add_missing_view_permissions2.rb
   end

data/db/migrate/20160805104605_rename_lock_template_setting.rb

@@ -1,4 +1,4 @@
-class RenameLockTemplateSetting < ActiveRecord::Migration
+class RenameLockTemplateSetting < ActiveRecord::Migration[4.2]
   def change
     reversible do |dir|
       dir.up do

data/db/migrate/20160818091421_add_permissions_from_default_roles.rb

@@ -1,4 +1,4 @@
-class AddPermissionsFromDefaultRoles < ActiveRecord::Migration
+class AddPermissionsFromDefaultRoles < ActiveRecord::Migration[4.2]
   def up
     # Moved to seeds see http://projects.theforeman.org/issues/17585
   end

data/db/migrate/20160925213030_change_discovery_widget_names.rb

@@ -1,4 +1,4 @@
-class ChangeDiscoveryWidgetNames < ActiveRecord::Migration
+class ChangeDiscoveryWidgetNames < ActiveRecord::Migration[4.2]
   def up
     Widget.where(:name => 'Discovery widget').\
       update_all(:name => 'Discovered Hosts')

data/db/migrate/20160927164411_define_explicit_length_for_discovery_rule_attributes.rb

@@ -1,4 +1,4 @@
-class DefineExplicitLengthForDiscoveryRuleAttributes < ActiveRecord::Migration
+class DefineExplicitLengthForDiscoveryRuleAttributes < ActiveRecord::Migration[4.2]
   def change
     change_column :discovery_rules, :name, :string, :limit => 255
     change_column :discovery_rules, :search, :string, :limit => 255

data/db/migrate/20161006094714_add_constraints_on_subnets_smart_proxies.rb

@@ -1,4 +1,4 @@
-class AddConstraintsOnSubnetsSmartProxies < ActiveRecord::Migration
+class AddConstraintsOnSubnetsSmartProxies < ActiveRecord::Migration[4.2]
   def change
     # turn off Foreign Key checks
     if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
@@ -7,6 +7,9 @@ class AddConstraintsOnSubnetsSmartProxies < ActiveRecord::Migration
       ActiveRecord::Migration.execute "SET FOREIGN_KEY_CHECKS=0;"
     end
 
+    # if there's some wrong key already, clean the foreign key first
+    Subnet.unscoped.where(["discovery_id IS NOT NULL AND discovery_id NOT IN (?)", SmartProxy.unscoped.pluck(:id)]).update_all(:discovery_id => nil)
+
     add_foreign_key "subnets", "smart_proxies", :name => "subnets_discovery_id_fk", :column => "discovery_id"
     
     # turn on Foreign Key checks in MySQL only

data/lib/foreman_discovery/engine.rb

@@ -6,6 +6,7 @@ module ForemanDiscovery
   #Inherit from the Rails module of the parent app (Foreman), not the plugin.
   #Thus, inherits from ::Rails::Engine and not from Rails::Engine
   class Engine < ::Rails::Engine
+    engine_name 'foreman_discovery'
 
     # support pre-4 Rails versions
     config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_discovery/concerns"]
@@ -42,7 +43,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 1.16.0'
+        requires_foreman '>= 1.17.0'
 
         # discovered hosts permissions
         security_block :discovery do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "10.0.0"
+  VERSION = "11.0.0"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -3,14 +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
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 9.1.0\n"
+"Project-Id-Version: foreman_discovery 10.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-17 15:39+0200\n"
-"PO-Revision-Date: 2017-10-17 23:23+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"POT-Creation-Date: 2017-12-11 10:28+0100\n"
+"PO-Revision-Date: 2017-12-12 15:15+0000\n"
+"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +54,7 @@ msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:41
 msgid "Create a discovered host for testing (use /facts to create new hosts)"
-msgstr "Crea un amfitrió descobert per a provar-ho  (utilitzeu /facts per crear nous amfitrions)"
+msgstr "Crea un amfitrió descobert per a provar-ho  (utilitzeu /facts per crear amfitrions nous)"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:50
 msgid "Provision a discovered host"
@@ -61,7 +62,7 @@ msgstr "Aprovisiona un amfitrió descobert"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:55
 msgid "not required if using a subnet with DHCP proxy"
-msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermediari de DHCP"
+msgstr "no es requereix si s'està utilitzant una subxarxa amb servidor intermediari DHCP"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:56
 msgid "not required if it's a virtual machine"
@@ -98,7 +99,7 @@ msgid "Execute rules against a discovered host"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:123
-#: ../app/controllers/discovered_hosts_controller.rb:152
+#: ../app/controllers/discovered_hosts_controller.rb:150
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
@@ -107,7 +108,7 @@ msgid "Unable to provision %{host}: %{errors}"
 msgstr "No es pot aprovisionar a %{host}: %{errors}"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:132
-#: ../app/controllers/discovered_hosts_controller.rb:159
+#: ../app/controllers/discovered_hosts_controller.rb:157
 msgid "No rule found for host %s"
 msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 
@@ -116,12 +117,12 @@ 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:143
-#: ../app/controllers/discovered_hosts_controller.rb:165
+#: ../app/controllers/discovered_hosts_controller.rb:163
 msgid "Errors during auto provisioning: %s"
 msgstr "Erros durant l'auto aprovisionament: %s"
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:146
-#: ../app/controllers/discovered_hosts_controller.rb:168
+#: ../app/controllers/discovered_hosts_controller.rb:166
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -184,15 +185,23 @@ msgstr ""
 msgid "flag is used for temporary shutdown of rules"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:43
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:39
+msgid "location ID for provisioned hosts"
+msgstr ""
+
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:40
+msgid "organization ID for provisioned hosts"
+msgstr ""
+
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:44
 msgid "Create a discovery rule"
 msgstr "Crea una regla de descobriment"
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:51
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:52
 msgid "Update a rule"
 msgstr "Actualitza una regla"
 
-#: ../app/controllers/api/v2/discovery_rules_controller.rb:59
+#: ../app/controllers/api/v2/discovery_rules_controller.rb:60
 msgid "Delete a rule"
 msgstr "Suprimeix una regla"
 
@@ -252,59 +261,59 @@ msgstr ""
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:140
 msgid "Destroyed selected hosts"
-msgstr ""
+msgstr "S'han destruït els amfitrions seleccionats"
 
-#: ../app/controllers/discovered_hosts_controller.rb:144
+#: ../app/controllers/discovered_hosts_controller.rb:142
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:156
+#: ../app/controllers/discovered_hosts_controller.rb:154
 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:184
+#: ../app/controllers/discovered_hosts_controller.rb:182
 msgid "Discovered hosts are provisioning now"
 msgstr "Els amfitrions descoberts ara tenen aprovisionament"
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Highlights"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Storage"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Hardware"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Network"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Software"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "IPMI"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:213
+#: ../app/controllers/discovered_hosts_controller.rb:214
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:290
+#: ../app/controllers/discovered_hosts_controller.rb:291
 msgid "No hosts were found with that id or name"
-msgstr "No s'ha trobat cap amfitrió amb aquest id. o nom"
+msgstr "No s'ha trobat cap amfitrió amb aquest ID o nom"
 
-#: ../app/controllers/discovered_hosts_controller.rb:294
+#: ../app/controllers/discovered_hosts_controller.rb:295
 msgid "No hosts selected"
 msgstr "Cap amfitrió seleccionat"
 
-#: ../app/controllers/discovered_hosts_controller.rb:300
+#: ../app/controllers/discovered_hosts_controller.rb:301
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
 
@@ -494,23 +503,23 @@ msgstr "No es pot realitzar kexec a %{name} a través de %{url}: %{msg}"
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:20
+#: ../app/models/host/managed_extensions.rb:23
 msgid "Reloading kernel on %s"
 msgstr "S'està tornant a carregar el kernel a %s"
 
-#: ../app/models/host/managed_extensions.rb:22
+#: ../app/models/host/managed_extensions.rb:25
 msgid "Rebooting %s"
 msgstr "S'està reiniciant %s"
 
-#: ../app/models/host/managed_extensions.rb:43
+#: ../app/models/host/managed_extensions.rb:46
 msgid "Kexec template not associated with operating system"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:48
+#: ../app/models/host/managed_extensions.rb:51
 msgid "Kernel kexec URL is invalid: '%s'"
 msgstr ""
 
-#: ../app/models/host/managed_extensions.rb:49
+#: ../app/models/host/managed_extensions.rb:52
 msgid "Init RAM kexec URL is invalid: '%s'"
 msgstr ""
 
@@ -728,7 +737,7 @@ msgstr ""
 
 #: ../app/views/discovered_hosts/_discovered_host_modal.html.erb:24
 msgid "Create Host"
-msgstr ""
+msgstr "Crea un amfitrió"
 
 #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:5
 msgid "Select all items in this page"
@@ -821,7 +830,7 @@ msgstr "Amfitrions descoberts: %s"
 
 #: ../app/views/discovered_hosts/show.html.erb:34
 msgid "Interfaces"
-msgstr ""
+msgstr "Interfícies"
 
 #: ../app/views/discovered_hosts/show.html.erb:41
 msgid "Type"
@@ -851,7 +860,7 @@ msgstr ""
 
 #: ../app/views/discovered_hosts/welcome.html.erb:9
 msgid "Learn more about this in the documentation."
-msgstr ""
+msgstr "Obteniu més informació sobre això a la documentació."
 
 #: ../app/views/discovered_mailer/discovered_summary.html.erb:6
 msgid "Summary report for discovered hosts from Foreman"
@@ -993,7 +1002,7 @@ msgstr "Habilitada"
 
 #: ../app/views/discovery_rules/new.html.erb:1
 msgid "New Discovery Rule"
-msgstr "Nova regla de descobriment"
+msgstr "Regla de descobriment nova"
 
 #: ../db/seeds.d/70_discovery_mail_notification.rb:3
 msgid "A summary of discovered hosts"