foreman_discovery 22.0.2 → 22.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88ecd56a2e51a5e9f79ad75f9b3214dbd639bd7dccef4fad054b02ed930047ea
-  data.tar.gz: 6ff4fafc798c38ef7097fcef16b777966ba9154ca1f13af52d62b47c2ef6eea5
+  metadata.gz: 7fc5eb4a3d41d11a816e54461373bd33f6b3562d69aa739d2f38802e3c370e46
+  data.tar.gz: 2f3ab4b2ac4b57dc7380f7034b4de1956a0d8f04ec41e55aa97dc7a18c853650
 SHA512:
-  metadata.gz: 7d28310f1bc924f34c60cbe5f0998ad567a61b3ef244503a7247204ef6ffd784e241243bb0b3b4e3f86ff2d619d89961469716966e0e9fa4d851a88010eb19e0
-  data.tar.gz: 5194001c735a6edbee4a50fb5fe5eb4e9f18d19a74317c4bd15dae1d32f74a35d49d4136c0acfc9df45e4dc7f12671a15fe60b9bd8efde3aefeca4174ba29bff
+  metadata.gz: 9e110a0b8aaab95b616e1c744ed1c720f8d5c97126cef6ee2e49d78e4d3065f34dde95a24d62b76ccc20af93c9b8747e01d585fe7b7a076d4f32004be0e0c183
+  data.tar.gz: bf8b6daa88492f1c09349cb0628b8fd4fb4e72f231e0a1926e8e0bef29320600e7301bced891230e4d6d2844dccf912629a921dadc80cd8326ba67447a54eed3

data/app/controllers/discovered_hosts_controller.rb

@@ -35,7 +35,7 @@ class DiscoveredHostsController < ::ApplicationController
       :discovery_attribute_set
     ], {:interfaces => :subnet})
     fact_array = @hosts.collect do |host|
-      [host.id, Hash[host.fact_values.joins(:fact_name).where('fact_names.name' => Setting::Discovered.discovery_fact_column_array).pluck(:name, :value)]]
+      [host.id, Hash[host.fact_values.joins(:fact_name).where('fact_names.name' => Setting['discovery_fact_column']).pluck(:name, :value)]]
     end
     @host_facts = Hash[fact_array]
   end

data/app/models/host/discovered.rb

@@ -63,15 +63,15 @@ class Host::Discovered < ::Host::Base
     bootif_mac = FacterUtils::bootif_mac(facts).try(:downcase)
     hostname = ''
     if Setting[:discovery_naming] == 'MAC-name'
-      hostname_mac = return_first_valid_mac(Setting::Discovered.discovery_hostname_fact_array, facts) || bootif_mac
+      hostname_mac = return_first_valid_mac(Setting['discovery_hostname'], facts) || bootif_mac
       hostname = NameGenerator.new.generate_next_mac_name(hostname_mac)
     elsif Setting[:discovery_naming] == 'Random-name'
       hostname = NameGenerator.new.generate_next_random_name
     else
       prefix_from_settings = Setting[:discovery_prefix]
       hostname_prefix = prefix_from_settings if prefix_from_settings.present? && prefix_from_settings.match(/^[a-zA-Z].*/)
-      name_fact = return_first_valid_fact(Setting::Discovered.discovery_hostname_fact_array, facts)
-      raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"), Setting::Discovered.discovery_hostname_fact_array.join(', '))) unless name_fact && name_fact.present?
+      name_fact = return_first_valid_fact(Setting['discovery_hostname'], facts)
+      raise(::Foreman::Exception.new(N_("Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting: %s"), Setting['discovery_hostname'].join(', '))) unless name_fact && name_fact.present?
       hostname = normalize_string_for_hostname("#{hostname_prefix}#{name_fact}")
     end
     Rails.logger.warn "Hostname does not start with an alphabetical character" unless hostname.downcase.match(/^[a-z]/)

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

@@ -3,7 +3,7 @@ module ForemanDiscovery
   module ImportHooks
     class LockTemplates < ImportHook
       def after_populate
-        lock_templates if Setting::Discovered.discovery_lock? && host.subnet.tftp?
+        lock_templates if Setting['discovery_lock'] && host.subnet.tftp?
       end
 
       def lock_templates

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

@@ -6,7 +6,7 @@
 <td class="hidden-tablet hidden-xs"><%= discovery_attribute(host, :disk_count) %></td>
 <td class="hidden-tablet hidden-xs"><%= number_to_human_size(discovery_attribute(host, :disks_size, 0) * 1024 * 1024) %></td>
 <%
-  Setting::Discovered.discovery_fact_column_array.each do |name|
+  Setting['discovery_fact_column'].each do |name|
 %>
 <td class="hidden-tablet hidden-xs"><%= @host_facts[host.id][name] || 'N/A' %></td>
 <% end %>

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

@@ -10,7 +10,7 @@
       <th class="hidden-tablet hidden-xs"><%= sort :memory, :as => _('Memory') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :disk_count, :as => _('Disk Count') %></th>
       <th class="hidden-tablet hidden-xs"><%= sort :disks_size, :as => _('Disks Size') %></th>
-      <% Setting::Discovered.discovery_fact_column_array.each do |fact_column| %>
+      <% Setting['discovery_fact_column'].each do |fact_column| %>
         <th class="hidden-tablet hidden-xs"><%= fact_column.capitalize %></th>
       <% end %>
       <th class="hidden-tablet hidden-xs"><%= sort :location, :as => _('Location') %></th>

data/db/migrate/20221102065954_fix_discovery_settings_category_to_dsl.rb

@@ -3,7 +3,7 @@
 class FixDiscoverySettingsCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
     # rubocop:disable Rails/SkipsModelValidations
-    Setting.where(category: 'Setting::Discovered').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::Discovered').update_all(category: 'Setting') if column_exists?(:settings, :category)
     # rubocop:enable Rails/SkipsModelValidations
   end
 end

data/db/migrate/20221102075151_migrate_discovery_hostname_and_fact_column_to_array.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class MigrateDiscoveryHostnameAndFactColumnToArray < ActiveRecord::Migration[6.0]
+  def up
+    ['discovery_hostname', 'discovery_fact_column'].each do |setting_name|
+      setting = Setting.find_by(name: setting_name)
+      if !setting.nil? && setting.value.is_a?(String)
+        setting.value = setting.value.split(",").map(&:strip)
+        setting.save
+      end
+    end
+  end
+end

data/lib/foreman_discovery/engine.rb

@@ -15,12 +15,6 @@ module ForemanDiscovery
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/services"]
 
-    # Load this before the Foreman config initializers, so that the Setting.descendants
-    # list includes the plugin STI setting class
-    initializer 'foreman_discovery.load_default_settings', :before => :load_config_initializers do |app|
-      require_dependency File.expand_path("../../../app/models/setting/discovered.rb", __FILE__) if (Setting.table_exists? rescue(false))
-    end
-
     initializer "foreman_discovery.add_rabl_view_path" do |app|
       Rabl.configure do |config|
         config.view_paths << ForemanDiscovery::Engine.root.join('app', 'views')
@@ -85,10 +79,10 @@ module ForemanDiscovery
               description: N_("Clean all reported facts during provisioning (except discovery facts)")
 
             setting "discovery_hostname",
-              type: :string,
-              default: "discovery_bootif",
+              type: :array,
+              default: ["discovery_bootif"],
               full_name: N_("Hostname facts"),
-              description: N_("List of facts to use for the hostname (separated by comma, first wins)")
+              description: N_("List of facts to use for the hostname (first wins)")
 
             validates "discovery_hostname", presence: true
 
@@ -113,10 +107,10 @@ module ForemanDiscovery
             validates "discovery_prefix", presence: true
 
             setting "discovery_fact_column",
-              type: :string,
-              default: "",
+              type: :array,
+              default: [],
               full_name: N_("Fact columns"),
-              description: N_("Extra facter columns to show in host lists (separate by comma)")
+              description: N_("Extra facter columns to show in host lists")
 
             setting "discovery_facts_highlights",
               type: :string,

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "22.0.2"
+  VERSION = "22.0.4"
 end

data/locale/ca/foreman_discovery.po

@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the foreman_discovery package.
 #
 # Translators:
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015-2016
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 21.0.0\n"
+"Project-Id-Version: foreman_discovery 22.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017\n"
 "Language-Team: Catalan (http://www.transifex.com/foreman/foreman/language/ca/)"
 "\n"
 "MIME-Version: 1.0\n"
@@ -88,9 +88,6 @@ msgstr "Clona %s"
 msgid "Collapse All"
 msgstr ""
 
-msgid "Command line options for kexec during PXE-less provisioning."
-msgstr ""
-
 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}"
 
@@ -177,7 +174,7 @@ msgstr ""
 msgid "Discovered hosts summary"
 msgstr ""
 
-msgid "Discovery Kexec template"
+msgid "Discovery"
 msgstr ""
 
 msgid "Discovery Proxy"
@@ -306,6 +303,9 @@ msgstr ""
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr ""
 
+msgid "Foreman Discovery"
+msgstr ""
+
 msgid "Foreman discovered hosts summary"
 msgstr ""
 

data/locale/de/foreman_discovery.po

@@ -15,7 +15,7 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 21.0.0\n"
+"Project-Id-Version: foreman_discovery 22.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: Patrick Dolinic, 2021\n"
@@ -95,9 +95,6 @@ msgstr "%s klonen"
 msgid "Collapse All"
 msgstr "Alle einklappen"
 
-msgid "Command line options for kexec during PXE-less provisioning."
-msgstr "Kommandozeilenoptionen für kexec während PXE-loser Bereitstellung"
-
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Fakten konnten nicht vom Proxy %{url} abgerufen werden: %{error}"
 
@@ -184,8 +181,8 @@ msgstr "Erkannte Hosts, die von einem unbekannten Subnetz gemeldet wurden %s sin
 msgid "Discovered hosts summary"
 msgstr "Zusammenfassung entdeckter Hosts"
 
-msgid "Discovery Kexec template"
-msgstr "Discovery Kexec-Vorlage"
+msgid "Discovery"
+msgstr "Entdecken"
 
 msgid "Discovery Proxy"
 msgstr "Discovery-Proxy"
@@ -313,6 +310,9 @@ msgstr "DNS erzwingen"
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr "Erzwingen Sie die Erstellung von DNS-Einträgen bei der Bereitstellung des erkannten Hosts"
 
+msgid "Foreman Discovery"
+msgstr ""
+
 msgid "Foreman discovered hosts summary"
 msgstr "Foreman Zusammenfassung entdeckter Hosts"
 

data/locale/en/foreman_discovery.po

@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the foreman_discovery package.
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 21.0.0\n"
+"Project-Id-Version: foreman_discovery 22.0.2\n"
 "Report-Msgid-Bugs-To: foreman-dev@googlegroups.com\n"
 "PO-Revision-Date: 2015-12-27 01:18+0000\n"
 "Last-Translator: \n"
@@ -81,9 +81,6 @@ msgstr ""
 msgid "Collapse All"
 msgstr ""
 
-msgid "Command line options for kexec during PXE-less provisioning."
-msgstr ""
-
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr ""
 
@@ -170,7 +167,7 @@ msgstr ""
 msgid "Discovered hosts summary"
 msgstr ""
 
-msgid "Discovery Kexec template"
+msgid "Discovery"
 msgstr ""
 
 msgid "Discovery Proxy"
@@ -299,6 +296,9 @@ msgstr ""
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr ""
 
+msgid "Foreman Discovery"
+msgstr ""
+
 msgid "Foreman discovered hosts summary"
 msgstr ""
 

data/locale/en_GB/foreman_discovery.po

@@ -10,7 +10,7 @@
 # Lukáš Zapletal, 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 21.0.0\n"
+"Project-Id-Version: foreman_discovery 22.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>, 2015-2019\n"
@@ -91,9 +91,6 @@ msgstr ""
 msgid "Collapse All"
 msgstr "Collapse All"
 
-msgid "Command line options for kexec during PXE-less provisioning."
-msgstr "Command line options for kexec during PXE-less provisioning."
-
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "Could not get facts from proxy %{url}: %{error}"
 
@@ -180,8 +177,8 @@ msgstr ""
 msgid "Discovered hosts summary"
 msgstr "Discovered hosts summary"
 
-msgid "Discovery Kexec template"
-msgstr "Discovery Kexec template"
+msgid "Discovery"
+msgstr ""
 
 msgid "Discovery Proxy"
 msgstr "Discovery Proxy"
@@ -309,6 +306,9 @@ msgstr "Force DNS"
 msgid "Force DNS entries creation when provisioning discovered host"
 msgstr "Force DNS entries creation when provisioning discovered host"
 
+msgid "Foreman Discovery"
+msgstr ""
+
 msgid "Foreman discovered hosts summary"
 msgstr "Foreman discovered hosts summary"