foreman_discovery 26.0.1 → 26.1.0

data/app/assets/javascripts/foreman_discovery/locale/es/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Sergio Ocón-Cárdenas, 2014",
@@ -791,6 +791,9 @@
       "must be present.": [
         "debe estar presente."
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "debe comenzar con una letra o ERB."
       ],

data/app/assets/javascripts/foreman_discovery/locale/fr/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Baptiste Agasse <baptiste.agasse@gmail.com>, 2018-2019",
@@ -791,6 +791,9 @@
       "must be present.": [
         "doit être présent."
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "doit commencer par une lettre ou par ERB."
       ],

data/app/assets/javascripts/foreman_discovery/locale/gl/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
@@ -788,6 +788,9 @@
       "must be present.": [
         ""
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         ""
       ],

data/app/assets/javascripts/foreman_discovery/locale/it/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "caifti <caifti@gmail.com>, 2014",
@@ -788,6 +788,9 @@
       "must be present.": [
         ""
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "deve iniziare con una lettera o ERB."
       ],

data/app/assets/javascripts/foreman_discovery/locale/ja/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "山田 修司 🍣 Shuji Yamada <uzy.exe@gmail.com>, 2015",
@@ -785,6 +785,9 @@
       "must be present.": [
         "必須です。"
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "文字または ERB で開始する必要があります。"
       ],

data/app/assets/javascripts/foreman_discovery/locale/ka/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
@@ -788,6 +788,9 @@
       "must be present.": [
         "უნდა არსებობდეს."
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "უნდა იწყებოდეს სიმბოლოთი ან ERB-ით."
       ],

data/app/assets/javascripts/foreman_discovery/locale/ko/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2022",
@@ -785,6 +785,9 @@
       "must be present.": [
         "반드시 존재해야 합니다."
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "문자 또는 ERB로 시작해야 합니다."
       ],

data/app/assets/javascripts/foreman_discovery/locale/pt_BR/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Valeria S Silva <valeriassilva@live.com>, 2015",
@@ -791,6 +791,9 @@
       "must be present.": [
         "deve estar presente."
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "deve iniciar com uma letra ou ERB."
       ],

data/app/assets/javascripts/foreman_discovery/locale/ru/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Yulia <yulia.poyarkova@redhat.com>, 2016",
@@ -792,6 +792,9 @@
       "must be present.": [
         ""
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "должен начинаться с буквы или ERB"
       ],

data/app/assets/javascripts/foreman_discovery/locale/sv_SE/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "johnny.westerlund <johnny.westerlund@gmail.com>, 2014",
@@ -788,6 +788,9 @@
       "must be present.": [
         ""
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         ""
       ],

data/app/assets/javascripts/foreman_discovery/locale/zh_CN/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "Ewoud Kohl van Wijngaarden <ewoud+transifex@kohlvanwijngaarden.nl>, 2024",
@@ -785,6 +785,9 @@
       "must be present.": [
         "必须存在。"
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         "必须以字母或 ERB 开始。"
       ],

data/app/assets/javascripts/foreman_discovery/locale/zh_TW/foreman_discovery.js

@@ -3,7 +3,7 @@
   "locale_data": {
     "foreman_discovery": {
       "": {
-        "Project-Id-Version": "foreman_discovery 25.1.0",
+        "Project-Id-Version": "foreman_discovery 26.0.1",
         "Report-Msgid-Bugs-To": "",
         "PO-Revision-Date": "2013-11-15 17:25+0000",
         "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
@@ -788,6 +788,9 @@
       "must be present.": [
         ""
       ],
+      "must start with a letter": [
+        ""
+      ],
       "must start with a letter or ERB.": [
         ""
       ],

data/app/services/foreman_discovery/host_converter.rb

@@ -5,14 +5,16 @@ class ForemanDiscovery::HostConverter
   def self.to_managed(original_host, set_managed = true, set_build = true, added_attributes = {})
     host = original_host.becomes(::Host::Managed)
     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
       host.primary_interface.managed = set_managed
     end
+
+    host.attributes = host.apply_inherited_attributes(added_attributes)
+    host.set_hostgroup_defaults if host.hostgroup_id.present?
+
     # set build only and only on final save (facts are deleted)
     set_build_clean_facts(host) if set_build
     host
@@ -52,7 +54,7 @@ class ForemanDiscovery::HostConverter
     end
   end
 
-  def self.ip_for_subnet(subnet, mac, ip) 
+  def self.ip_for_subnet(subnet, mac, ip)
     return ip if ip && subnet&.unused_ip(mac)&.ip_include?(ip)
 
     unused_ip_for_subnet(subnet, mac, ip)

data/lib/foreman_discovery/engine.rb

@@ -88,7 +88,8 @@ module ForemanDiscovery
               setting "discovery_prefix",
                 type: :string,
                 default: "mac",
-                validate: { presence: true, format: { with: /\A[a-zA-Z]/, message: _("must start with a letter") } },
+                validate: { presence: true, format: { with: /\A[a-zA-Z][a-zA-Z0-9-]{0,61}\z/,
+                            message: _("must start with a letter. Allowed characters: `a-z`, `A-Z`, `0-9` and `-`. Max length is 62 characters.") } },
                 full_name: N_("Hostname prefix"),
                 description: N_("The default prefix to use for the host name, must start with a letter")
 
@@ -147,13 +148,6 @@ module ForemanDiscovery
                 full_name: N_("Locked PXELinux template name"),
                 description: N_("PXELinux template to be used when pinning a host to discovery")
 
-              setting "discovery_pxegrub_lock_template",
-                type: :string,
-                collection: snippets,
-                default: "pxegrub_discovery",
-                full_name: N_("Locked PXEGrub template name"),
-                description: N_("PXEGrub template to be used when pinning a host to discovery")
-
               setting "discovery_pxegrub2_lock_template",
                 type: :string,
                 collection: snippets,

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "26.0.1"
+  VERSION = "26.1.0"
 end

data/locale/ca/foreman_discovery.po

@@ -7,7 +7,7 @@
 # Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015-2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 25.1.0\n"
+"Project-Id-Version: foreman_discovery 26.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2017\n"
@@ -793,6 +793,9 @@ msgstr ""
 msgid "must be present."
 msgstr ""
 
+msgid "must start with a letter"
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr "ha de començar amb una lletra o ERB."
 

data/locale/cs_CZ/foreman_discovery.po

@@ -6,7 +6,7 @@
 # Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 25.1.0\n"
+"Project-Id-Version: foreman_discovery 26.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020\n"
@@ -793,6 +793,9 @@ msgstr ""
 msgid "must be present."
 msgstr ""
 
+msgid "must start with a letter"
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr ""
 

data/locale/de/foreman_discovery.po

@@ -15,7 +15,7 @@
 # stbenjam <stephen@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 25.1.0\n"
+"Project-Id-Version: foreman_discovery 26.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2013-11-15 17:25+0000\n"
 "Last-Translator: pdolinic, 2021\n"
@@ -800,6 +800,9 @@ msgstr "Standort Kennung für bereitgestellte Hosts"
 msgid "must be present."
 msgstr "muss vorhanden sein."
 
+msgid "must start with a letter"
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr "muss mit einem Buchstaben oder ERB beginnen."