foreman_discovery 7.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 946b59f0bacb0bb204abb6c4cf2920b74617e463
-  data.tar.gz: 7470dd4f66cc9af997f2819ec564e00208323af0
+  metadata.gz: e7e377aabf655f28aca2a7dd29852b38a285c3d2
+  data.tar.gz: d7102edb90f79ed5c386d63f055c312dcaf9eafa
 SHA512:
-  metadata.gz: 7bcdb1beeba717b1f8e6afb27e03321dc1e50fdeb1ff98f3bfc2f4ec676192df9db874806667915be7277a58cf91e0f221c3c65438a4b8ced5ff197405e5433d
-  data.tar.gz: dae728a38739b49ca16b1534f2458ed04203bbc48f171a67f153a479f03374b66f0b620081a769ec7f0a4cf1beb773e3a5c013bbc3adabc069ed626349335954
+  metadata.gz: a27026469ca5ff403f032e217a68c103850ff7575e63d41cfa30227e4c8e49aab04af36f967e5319bab0fb6e81e85213e91876421933d6e3b7dcdaa0ea676dee
+  data.tar.gz: f491253cc94345867d0e99fbfa18dd79c7f5a2561623e33dda6d29b393f012d781794bab8e04483617989b015caa3f844a910671dc335096c0884f15400b4122

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

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

data/app/controllers/discovered_hosts_controller.rb

@@ -50,9 +50,7 @@ class DiscoveredHostsController < ::ApplicationController
   end
 
   def edit
-    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false) unless @host.nil?
-    @host.attributes = @host.apply_inherited_attributes(discovered_host_params_host) unless discovered_host_params_host.empty?
-    @host.set_hostgroup_defaults
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false, discovered_host_params_host) unless @host.nil?
     setup_host_class_variables(@host)
     @override_taxonomy = true
     if params[:quick_submit]
@@ -63,9 +61,8 @@ class DiscoveredHostsController < ::ApplicationController
   end
 
   def update
-    @host = ::ForemanDiscovery::HostConverter.to_managed(@host)
+    @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, true, discovered_host_params_host)
     forward_url_options
-    @host.attributes = discovered_host_params_host
 
     perform_update(@host)
   end

data/app/models/host/discovered.rb

@@ -1,6 +1,7 @@
 class Host::Discovered < ::Host::Base
   include ScopedSearchExtensions
   include Foreman::Renderer
+  include BelongsToProxies
 
   belongs_to :hostgroup
   has_one    :discovery_attribute_set, :foreign_key => :host_id, :dependent => :destroy
@@ -29,6 +30,10 @@ class Host::Discovered < ::Host::Base
     where(taxonomy_conditions).order("hosts.created_at DESC")
   }
 
+  before_destroy { |record|
+    record.update_attribute(:managed, false)
+  }
+
   def self.import_host facts
     raise(::Foreman::Exception.new(N_("Invalid facts, must be a Hash"))) unless facts.is_a?(Hash)
 
@@ -114,20 +119,23 @@ class Host::Discovered < ::Host::Base
     self.discovery_attribute_set = DiscoveryAttributeSet.where(:host_id => id).first_or_create
     self.discovery_attribute_set.update_attributes(import_from_facts)
     # lock the host into discovery via PXE, if feature is enabled in settings
-    if Setting::Discovered.discovery_lock? && self.subnet.tftp?
-      begin
-        @host = self
-        Rails.logger.info "Locking discovered host #{self.mac} in subnet #{subnet}"
-        template = unattended_render(::ProvisioningTemplate.find_by_name(Setting['discovery_lock_template']).template)
-        subnet.tftp_proxy.set mac, :pxeconfig => template
-      rescue ::Foreman::Exception => e
-        ::Foreman::Logging.exception("Could not set tftp_proxy from proxy", e)
-      end
-    end
+    lock_templates if Setting::Discovered.discovery_lock? && self.subnet.tftp?
     self.save!
     parser
   end
 
+  def lock_templates
+    @host = self
+    TemplateKind::PXE.each do |kind|
+      template_name = Setting["discovery_#{kind.downcase}_lock_template"]
+      Rails.logger.info "Locking discovered host #{self.mac} in subnet #{subnet} via #{template_name} template"
+      template = unattended_render(::ProvisioningTemplate.find_by_name(template_name).template)
+      subnet.tftp_proxy.set(kind, mac, :pxeconfig => template)
+    end
+  rescue ::Foreman::Exception => e
+    ::Foreman::Logging.exception("Could not set tftp_proxy from proxy", e)
+  end
+
   def import_from_facts(facts = self.facts_hash)
     cpu_count  = facts['physicalprocessorcount'].to_i rescue 0
     memory     = facts['memorysize_mb'].to_f.ceil rescue 0

data/app/models/setting/discovered.rb

@@ -30,7 +30,9 @@ class Setting::Discovered < ::Setting
         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_lock_template', N_("PXE template to be used when pinning a host to discovery"), 'pxelinux_discovery', N_("Locked template name"),nil,{ :collection => Proc.new {Hash[ProvisioningTemplate.all.map{|template| [template[:name], template[:name]]}]} }),
+        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")),
       ].compact.each { |s| self.create s.update(:category => "Setting::Discovered")}
     end
@@ -64,7 +66,7 @@ class Setting::Discovered < ::Setting
   end
 
   def self.discovery_lock?
-    Foreman::Cast.to_bool(Setting['discovery_lock']) && !Setting['discovery_lock_template'].blank? && ProvisioningTemplate.exists?(:name => Setting['discovery_lock_template'])
+    Foreman::Cast.to_bool(Setting['discovery_lock'])
   end
 
   def self.from_array(setting)

data/app/services/foreman_discovery/host_converter.rb

@@ -3,9 +3,14 @@ class ForemanDiscovery::HostConverter
   # Converts discovered host to managed host without uptading the database.
   # Record must be saved explicitly (using save! or update_attributes! or similar).
   # Creates shallow copy.
-  def self.to_managed(original_host, set_managed = true, set_build = true)
+  def self.to_managed(original_host, set_managed = true, set_build = true, added_attributes = {})
     host = original_host.becomes(::Host::Managed)
+    host.clear_association_cache
     host.type = 'Host::Managed'
+
+    host.attributes = host.apply_inherited_attributes(added_attributes)
+    host.set_hostgroup_defaults if host.hostgroup_id.present?
+
     # the following flags can be skipped when parameters are set to false
     if set_managed
       host.managed = set_managed

data/app/views/api/v2/discovered_hosts/main.json.rabl

@@ -5,6 +5,10 @@ extends "api/v2/discovered_hosts/base"
 attributes :ip, :mac, :last_report, :subnet_id, :subnet_name, :hardware_model_name, :memory, :disk_count, :disks_size
 attribute :cpu_count => :cpus
 
+node :subnet_name do |host|
+  host.subnet.to_label if host.subnet.present?
+end
+
 if SETTINGS[:organizations_enabled]
   attributes :organization_id, :organization_name
 end

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

@@ -30,12 +30,12 @@
       </td>
       <%= render :partial => "discovered_host", :locals => {:host => host} %>
       <% if SETTINGS[:locations_enabled] -%>
-        <td class="hidden-tablet hidden-xs"><%= host.location.try(:name) %></td>
+        <td class="hidden-tablet hidden-xs"><%= host.location.try(:title) %></td>
       <% end -%>
       <% if SETTINGS[:organizations_enabled] -%>
-        <td class="hidden-tablet hidden-xs"><%= host.organization.try(:name) %></td>
+        <td class="hidden-tablet hidden-xs"><%= host.organization.try(:title) %></td>
       <% end -%>
-      <td class="hidden-tablet hidden-xs"><%= host.primary_interface.try(:subnet) %></td>
+      <td class="hidden-tablet hidden-xs"><%= host.primary_interface.try(:subnet).try(:to_label) %></td>
       <td class="hidden-tablet hidden-xs"><%= disc_report_column(host) %></td>
       <td>
         <!-- Modal -->

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

@@ -24,13 +24,11 @@
                                 _("Template"),
                                 render('discovery_rules/template_inline'),
                                 :title => _("Hostname for provisioned hosts"), :'data-placement' => 'bottom').html_safe %>
-            <%= text_f f, :max_count, :label => _('Hosts limit'), :help_inline => _('Maximum hosts provisioned with this rule (0 = unlimited)') %>
-            <%= text_f f, :priority, :help_inline => _('Rule priority (lower integer means higher priority)') %>
+            <%= number_f f, :max_count, :label => _('Hosts limit'), :help_inline => _('Maximum hosts provisioned with this rule (0 = unlimited)'), :min => 0, :max => (2**31 - 1) %>
+            <%= number_f f, :priority, :help_inline => _('Rule priority (lower integer means higher priority)'), :min => 0, :max => (2**31 - 1) %>
             <%= checkbox_f f, :enabled %>
           </div>
-          <% if show_taxonomy_tabs? %>
-            <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @discovery_rule %>
-          <% end %>
+          <%= render 'taxonomies/loc_org_tabs', :f => f, :obj => @discovery_rule %>
         </div>
     <%= submit_or_cancel f %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% title _("Discovery Rules") %>
-<% title_actions new_link(_("New Rule")), help_path %>
+<% title_actions new_link(_("New Rule")), help_button %>
 
 <table class="table table-bordered table-striped table-two-pane">
   <tr>

data/db/migrate/20160805104605_rename_lock_template_setting.rb

@@ -0,0 +1,14 @@
+class RenameLockTemplateSetting < ActiveRecord::Migration
+  def change
+    reversible do |dir|
+      dir.up do
+        setting = Setting.find_by_name("discovery_lock_template")
+        setting.destroy if setting
+      end
+      dir.down do
+        setting = Setting.find_by_name("discovery_pxelinux_lock_template")
+        setting.destroy if setting
+      end
+    end
+  end
+end

data/db/migrate/20160925213030_change_discovery_widget_names.rb

@@ -0,0 +1,11 @@
+class ChangeDiscoveryWidgetNames < ActiveRecord::Migration
+  def up
+    Widget.where(:name => 'Discovery widget').\
+      update_all(:name => 'Discovered Hosts')
+  end
+
+  def down
+    Widget.where(:name => 'Discovered Hosts').\
+      update_all(:name => 'Discovery widget')
+  end
+end

data/db/migrate/20160927164411_define_explicit_length_for_discovery_rule_attributes.rb

@@ -0,0 +1,7 @@
+class DefineExplicitLengthForDiscoveryRuleAttributes < ActiveRecord::Migration
+  def change
+    change_column :discovery_rules, :name, :string, :limit => 255
+    change_column :discovery_rules, :search, :string, :limit => 255
+    change_column :discovery_rules, :hostname, :string, :limit => 255
+  end
+end

data/db/migrate/20161006094714_add_constraints_on_subnets_smart_proxies.rb

@@ -0,0 +1,17 @@
+class AddConstraintsOnSubnetsSmartProxies < ActiveRecord::Migration
+  def change
+    # turn off Foreign Key checks
+    if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      ActiveRecord::Migration.execute "SET CONSTRAINTS ALL DEFERRED;"
+    elsif ActiveRecord::Base.connection.adapter_name.downcase.starts_with? 'mysql'
+      ActiveRecord::Migration.execute "SET FOREIGN_KEY_CHECKS=0;"
+    end
+
+    add_foreign_key "subnets", "smart_proxies", :name => "subnets_discovery_id_fk", :column => "discovery_id"
+    
+    # turn on Foreign Key checks in MySQL only
+    if ActiveRecord::Base.connection.adapter_name.downcase.starts_with? 'mysql'
+      ActiveRecord::Migration.execute "SET FOREIGN_KEY_CHECKS=1;"
+    end
+  end
+end

data/lib/foreman_discovery/engine.rb

@@ -1,6 +1,5 @@
 require 'fast_gettext'
 require 'gettext_i18n_rails'
-require 'deface'
 require 'rabl'
 
 module ForemanDiscovery
@@ -43,7 +42,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 1.13.0'
+        requires_foreman '>= 1.14.0'
 
         # discovered hosts permissions
         security_block :discovery do
@@ -67,6 +66,7 @@ module ForemanDiscovery
                                            :select_multiple_organization,
                                            :update_multiple_organization,
                                            :select_multiple_location, :refresh_facts, :reboot, :reboot_all],
+            :hosts                     => [:process_hostgroup],
             :"api/v2/discovered_hosts" => [:refresh_facts, :reboot, :reboot_all]
           }, :resource_type => 'Host'
           permission :destroy_discovered_hosts, {
@@ -160,7 +160,7 @@ module ForemanDiscovery
         parameter_filter Hostgroup, :type, :discovery_rules => [], :discovery_rule_ids => [], :discovery_rule_names => []
 
         # add dashboard widget
-        widget 'discovery_widget', :name=>N_('Discovery widget'), :sizex => 6, :sizey =>1
+        widget 'discovery_widget', :name=>N_('Discovered Hosts'), :sizex => 6, :sizey =>1
 
         # add template helpers
         allowed_template_helpers :rand
@@ -169,6 +169,13 @@ module ForemanDiscovery
         # apipie API documentation
         # Only available in 1.8, otherwise it has to be in the initializer below
         apipie_documented_controllers ["#{ForemanDiscovery::Engine.root}/app/controllers/api/v2/*.rb"]
+
+        # add discovery smart proxy to subnet
+        smart_proxy_for Subnet, :discovery,
+          :feature => 'Discovery',
+          :label => N_('Discovery Proxy'),
+          :description => N_('Discovery Proxy to use within this subnet for managing connection to discovered hosts'),
+          :api_description => N_('ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts')
       end
     end
 
@@ -197,9 +204,6 @@ module ForemanDiscovery
       # Controller extensions
       ::HostsController.send :include, ForemanDiscovery::Concerns::HostsControllerExtensions
       ::Api::V2::FactValuesController.send :include, Api::V2::FactValuesControllerExtensions
-
-      # Include subnet extensions
-      ::Subnet.send :include, DiscoverySubnet
     end
 
     rake_tasks do

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "7.0.1"
+  VERSION = "8.0.0"
 end

data/locale/ca/foreman_discovery.edit.po

@@ -1,17 +1,18 @@
 # 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>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: foreman_discovery 7.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-30 16:48+0200\n"
+"POT-Creation-Date: 2017-01-06 08:26+0100\n"
 "PO-Revision-Date: 2016-08-31 08:17+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"
@@ -22,23 +23,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ó"
 
@@ -63,14 +60,11 @@ msgid "not required if it's a virtual machine"
 msgstr ""
 
 #: ../app/controllers/api/v2/discovered_hosts_controller.rb:74
-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:76
-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:86
@@ -82,18 +76,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:94
-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:111
 msgid "Execute rules against a discovered host"
 msgstr ""
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117
-#: ../app/controllers/discovered_hosts_controller.rb:165
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:117 ../app/controllers/discovered_hosts_controller.rb:162
 msgid "Host %{host} was provisioned with rule %{rule}"
 msgstr "L'amfitrió %{host} va ser aprovisionat amb la regla %{rule}"
 
@@ -101,8 +91,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:126
-#: ../app/controllers/discovered_hosts_controller.rb:172
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:126 ../app/controllers/discovered_hosts_controller.rb:169
 msgid "No rule found for host %s"
 msgstr "No s'ha trobat cap regla per a l'amfitrió %s"
 
@@ -110,13 +99,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:137
-#: ../app/controllers/discovered_hosts_controller.rb:178
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:137 ../app/controllers/discovered_hosts_controller.rb:175
 msgid "Errors during auto provisioning: %s"
 msgstr "Erros durant l'auto aprovisionament: %s"
 
-#: ../app/controllers/api/v2/discovered_hosts_controller.rb:140
-#: ../app/controllers/discovered_hosts_controller.rb:181
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:140 ../app/controllers/discovered_hosts_controller.rb:178
 msgid "No discovered hosts to provision"
 msgstr "Sense amfitrions descoberts per aprovisionar"
 
@@ -136,8 +123,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:202
-#: ../app/controllers/discovered_hosts_controller.rb:123
+#: ../app/controllers/api/v2/discovered_hosts_controller.rb:202 ../app/controllers/discovered_hosts_controller.rb:120
 msgid "Discovered hosts are rebooting now"
 msgstr "Ara s'estan reiniciant els amfitrions descoberts"
 
@@ -162,8 +148,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
@@ -171,8 +156,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
@@ -211,95 +195,95 @@ msgstr "Errors durant el reinici: %s"
 msgid "No discovered hosts to reboot"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:59
+#: ../app/controllers/discovered_hosts_controller.rb:57
 msgid "Successfully provisioned %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:91
+#: ../app/controllers/discovered_hosts_controller.rb:88
 msgid "Facts refreshed for %s"
 msgstr "Els objectes d'interès que s'han refrescat per a %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:93
+#: ../app/controllers/discovered_hosts_controller.rb:90
 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:96
+#: ../app/controllers/discovered_hosts_controller.rb:93
 msgid "Failed to refresh facts for %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:103
+#: ../app/controllers/discovered_hosts_controller.rb:100
 msgid "Host of type %s can not be rebooted"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:107
+#: ../app/controllers/discovered_hosts_controller.rb:104
 msgid "Rebooting host %s"
 msgstr "S'està reiniciant l'amfitrió %s"
 
-#: ../app/controllers/discovered_hosts_controller.rb:109
+#: ../app/controllers/discovered_hosts_controller.rb:106
 msgid "Failed to reboot host %s"
 msgstr "No s'ha pogut reiniciar l'amfitrió %s."
 
-#: ../app/controllers/discovered_hosts_controller.rb:112
+#: ../app/controllers/discovered_hosts_controller.rb:109
 msgid "Failed to reboot host %{hostname} with error %{error_message}"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:126
+#: ../app/controllers/discovered_hosts_controller.rb:123
 msgid "Failed to reboot hosts with error %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:140
+#: ../app/controllers/discovered_hosts_controller.rb:137
 msgid "Destroyed selected hosts"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:142
+#: ../app/controllers/discovered_hosts_controller.rb:139
 msgid "The following hosts were not deleted: %s"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:169
+#: ../app/controllers/discovered_hosts_controller.rb:166
 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:197
+#: ../app/controllers/discovered_hosts_controller.rb:194
 msgid "Discovered hosts are provisioning now"
 msgstr "Els amfitrions descoberts ara tenen aprovisionament"
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Highlights"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Storage"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Hardware"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Network"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Software"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "IPMI"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:226
+#: ../app/controllers/discovered_hosts_controller.rb:223
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../app/controllers/discovered_hosts_controller.rb:303
+#: ../app/controllers/discovered_hosts_controller.rb:300
 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:307
+#: ../app/controllers/discovered_hosts_controller.rb:304
 msgid "No hosts selected"
 msgstr "Cap amfitrió seleccionat"
 
-#: ../app/controllers/discovered_hosts_controller.rb:313
+#: ../app/controllers/discovered_hosts_controller.rb:310
 msgid "Something went wrong while selecting hosts - %s"
 msgstr "Alguna cosa va anar malament mentre se seleccionaven els amfitrions - %s"
 
@@ -315,19 +299,15 @@ msgstr "Regla inhabilitada"
 msgid "%s ago"
 msgstr "fa %s"
 
-#: ../app/helpers/discovered_hosts_helper.rb:14
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
+#: ../app/helpers/discovered_hosts_helper.rb:14 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:46
 msgid "Auto Provision"
 msgstr "Auto aprovisiona"
 
-#: ../app/helpers/discovered_hosts_helper.rb:15
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
+#: ../app/helpers/discovered_hosts_helper.rb:15 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:47
 msgid "Refresh facts"
 msgstr "Refresca els objectes d'interès"
 
-#: ../app/helpers/discovered_hosts_helper.rb:16
-#: ../app/models/setting/discovered.rb:23
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
+#: ../app/helpers/discovered_hosts_helper.rb:16 ../app/models/setting/discovered.rb:23 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:48
 msgid "Reboot"
 msgstr "Reinicia"
 
@@ -335,8 +315,7 @@ msgstr "Reinicia"
 msgid "Back"
 msgstr "Enrere"
 
-#: ../app/helpers/discovered_hosts_helper.rb:21
-#: ../app/helpers/discovered_hosts_helper.rb:38
+#: ../app/helpers/discovered_hosts_helper.rb:21 ../app/helpers/discovered_hosts_helper.rb:38
 msgid "Select Action"
 msgstr "Selecciona l'acció"
 
@@ -344,8 +323,7 @@ msgstr "Selecciona l'acció"
 msgid "Expand All"
 msgstr "Expandeix-ho tot"
 
-#: ../app/helpers/discovered_hosts_helper.rb:28
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
+#: ../app/helpers/discovered_hosts_helper.rb:28 ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:49
 msgid "Delete %s?"
 msgstr "Voleu suprimir %s?"
 
@@ -385,7 +363,7 @@ msgstr "Es va informar en els últims 7 dies"
 msgid "Provision"
 msgstr "Aprovisiona"
 
-#: ../app/helpers/discovery_rules_helper.rb:26
+#: ../app/helpers/discovery_rules_helper.rb:26 ../lib/foreman_discovery/engine.rb:163
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -430,57 +408,50 @@ msgid "must start with a letter or ERB."
 msgstr "ha de començar amb una lletra o ERB."
 
 #: ../app/models/discovery_rule.rb:45
-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:51
 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:33
+#: ../app/models/host/discovered.rb:38
 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:38
-msgid ""
-"Expected discovery_fact '%s' is missing, unable to detect primary interface "
-"and set hostname"
+#: ../app/models/host/discovered.rb:43
+msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:45
-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:50
+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:62
+#: ../app/models/host/discovered.rb:67
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:112
+#: ../app/models/host/discovered.rb:117
 msgid "Unable to assign subnet, primary interface is missing IP address"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:166
+#: ../app/models/host/discovered.rb:174
 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:182
+#: ../app/models/host/discovered.rb:190
 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:190
+#: ../app/models/host/discovered.rb:198
 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:209
+#: ../app/models/host/discovered.rb:217
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -525,9 +496,7 @@ msgid "Hostname facts"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:22
-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:22
@@ -603,9 +572,7 @@ msgid "IPMI facts"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:32
-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:32
@@ -613,41 +580,55 @@ msgid "Lock PXE"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:33
-msgid "PXE template to be used when pinning a host to discovery"
+msgid "PXELinux template to be used when pinning a host to discovery"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:33
-msgid "Locked template name"
+msgid "Locked PXELinux template name"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:34
-msgid "Force DNS entries creation when provisioning discovered host"
+msgid "PXEGrub template to be used when pinning a host to discovery"
 msgstr ""
 
 #: ../app/models/setting/discovered.rb:34
+msgid "Locked PXEGrub template name"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:35
+msgid "PXEGrub2 template to be used when pinning a host to discovery"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:35
+msgid "Locked PXEGrub2 template name"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:36
+msgid "Force DNS entries creation when provisioning discovered host"
+msgstr ""
+
+#: ../app/models/setting/discovered.rb:36
 msgid "Force DNS"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:41
+#: ../app/models/setting/discovered.rb:43
 msgid "The default location to place discovered hosts in"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:41
+#: ../app/models/setting/discovered.rb:43
 msgid "Discovery location"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:49
+#: ../app/models/setting/discovered.rb:51
 msgid "The default organization to place discovered hosts in"
 msgstr ""
 
-#: ../app/models/setting/discovered.rb:49
+#: ../app/models/setting/discovered.rb:51
 msgid "Discovery organization"
 msgstr ""
 
 #: ../app/services/foreman_discovery/fact_parser.rb:9
-msgid ""
-"Unable to detect primary interface using MAC '%{mac}' specified by "
-"discovery_fact '%{fact}'"
+msgid "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
 msgstr ""
 
 #: ../app/services/foreman_discovery/node_api/node_resource.rb:75
@@ -666,25 +647,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: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
 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:9 ../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:10 ../app/views/discovered_mailer/discovered_summary.html.erb:21 ../app/views/discovered_mailer/discovered_summary.text.erb:13
 msgid "Memory"
 msgstr "Memòria"
 
@@ -700,8 +671,7 @@ msgstr ""
 msgid "Create host"
 msgstr ""
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
-#: ../lib/foreman_discovery/engine.rb:147
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2 ../lib/foreman_discovery/engine.rb:148
 msgid "Discovered hosts"
 msgstr "Amfitrions descoberts"
 
@@ -713,38 +683,27 @@ msgstr "Selecciona tots els ítems en aquesta pàgina"
 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: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
 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:8 ../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_mailer/discovered_summary.html.erb:22
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:14
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:11 ../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_hosts/_discovered_hosts_list.html.erb:12
-#: ../app/views/discovered_mailer/discovered_summary.html.erb:23
-#: ../app/views/discovered_mailer/discovered_summary.text.erb:15
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:12 ../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"
 
-#: ../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:17 ../app/views/discovered_hosts/_selected_hosts.html.erb:10
 msgid "Location"
 msgstr "Ubicació"
 
-#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20
-#: ../app/views/discovered_hosts/_selected_hosts.html.erb:13
+#: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:20 ../app/views/discovered_hosts/_selected_hosts.html.erb:13
 msgid "Organization"
 msgstr "Organització"
 
@@ -781,9 +740,7 @@ msgid "Warning"
 msgstr "Advertència"
 
 #: ../app/views/discovered_hosts/multiple_destroy.html.erb:5
-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
@@ -826,13 +783,11 @@ 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 ""
 
@@ -885,33 +840,23 @@ 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
@@ -958,10 +903,22 @@ msgstr "Nova regla de descobriment"
 msgid "A summary of discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:152
+#: ../lib/foreman_discovery/engine.rb:153
 msgid "Discovery rules"
 msgstr "Regles de descobriment"
 
+#: ../lib/foreman_discovery/engine.rb:176
+msgid "Discovery Proxy"
+msgstr ""
+
+#: ../lib/foreman_discovery/engine.rb:177
+msgid "Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
+#: ../lib/foreman_discovery/engine.rb:178
+msgid "ID of Discovery Proxy to use within this subnet for managing connection to discovered hosts"
+msgstr ""
+
 #: ../lib/foreman_discovery/engine.rb:162
-msgid "Discovery widget"
-msgstr "Estri de descobriment"
+#~ msgid "Discovery widget"
+#~ msgstr "Estri de descobriment"