foreman_discovery 19.0.1 → 19.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 427ba539a0f0044029faf7ffaca507c4091736f89a14de73559e81515295780a
-  data.tar.gz: 4f7a1b8fee20f9dd472a06b9dce2f385bc02246de5e592a2923e3156e332ee66
+  metadata.gz: 6bd2954e2d65719300eae48b5847be020a4cd3664c4c6178e8158cf6a1a29d91
+  data.tar.gz: e053e6f488855af9fc52839149965a128021dac69de2549c62b631746bc64c71
 SHA512:
-  metadata.gz: 6e2655e4136af4af6cd76fa3415ce0463ecc3984ed6e89d703e24eedc83f518b59481722fb232d008643f8e78beb4d523f95f80333c6ffac0e120fb49d91fe48
-  data.tar.gz: d18c12e3f57d69a80bf79ebfaa4e5de88a779c10aa12790ae057446fc3a4940c47f6654aa64edcec8fbfe430b9fa6a54e727476319ac61b11e61e78893b712c6
+  metadata.gz: 141f8814847c37d987bb177b3159b9eed90cbd66cf7aad8f7f5b7fc984500ca4bee6079305d1f5f8f605769ec6b15e9872a7315a01a4ba77c39f5d97dd85b8a8
+  data.tar.gz: cb2e36b062bbf8fd05ccb63b1e41eec7e1fecf35f130b97d24e3211c6c07ad1fa35fa8e727e1f23210f49760f3b6d0337ba9249c3fa7e4d864e08f3d3b251d6c

data/app/models/setting/discovered.rb

@@ -14,8 +14,8 @@ class Setting::Discovered < ::Setting
 
   def self.default_settings
     [
-      self.set('discovery_location', N_("The default location to place discovered hosts in"), "", N_("Discovery location"), nil, { :collection => Proc.new {Hash[Location.all.map{|loc| [loc[:title], loc[:title]]}]} }),
-      self.set('discovery_organization', N_("The default organization to place discovered hosts in"), "", N_("Discovery organization"), nil, { :collection => Proc.new {Hash[Organization.all.map{|org| [org[:title], org[:title]]}]} }),
+      self.set('discovery_location', N_("The default location to place discovered hosts in"), "", N_("Discovery location"), nil, { :collection => Proc.new {Hash[[['', '']].concat Location.all.map{|loc| [loc[:title], loc[:title]]}]} }),
+      self.set('discovery_organization', N_("The default organization to place discovered hosts in"), "", N_("Discovery organization"), nil, { :collection => Proc.new {Hash[[['', '']].concat Organization.all.map{|org| [org[:title], org[:title]]}]} }),
       self.set('discovery_fact', N_("Fact name to use for primary interface detection"), "discovery_bootif", N_("Interface fact")),
       self.set('discovery_auto_bond', N_("Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"), false, N_("Create bond interfaces")),
       self.set('discovery_clean_facts', N_("Clean all reported facts during provisioning (except discovery facts)"), false, N_("Clean all facts")),

data/app/views/foreman_discovery/debian_kexec.erb

@@ -4,18 +4,17 @@ name: Discovery Debian kexec
 oses:
 - Debian
 - Ubuntu
--%>
-<%#
-This template is used to pass command line options to kexec when reloading
-kernel on a discovered host instead of rebooting. This is useful in PXE-less
-environments. The template must generate JSON format with the following items
-"kernel", "initram", "append" and "extra". The kexec command is composed in
-the following way:
-
-kexec --force --debug --append=$append --initrd=$initram $extra $kernel
-
-Please read kexec(8) man page for more information about semantics.
-Extra options like --reset-vga can be set via "extra" array.
+description: |
+  This template is used to pass command line options to kexec when reloading
+  kernel on a discovered host instead of rebooting. This is useful in PXE-less
+  environments. The template must generate JSON format with the following items
+  "kernel", "initram", "append" and "extra". The kexec command is composed in
+  the following way:
+  
+  kexec --force --debug --append=$append --initrd=$initram $extra $kernel
+  
+  Please read kexec(8) man page for more information about semantics.
+  Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -14,18 +14,17 @@ oses:
 - RedHat 5
 - RedHat 6
 - RedHat 7
--%>
-<%#
-This template is used to pass command line options to kexec when reloading
-kernel on a discovered host instead of rebooting. This is useful in PXE-less
-environments. The template must generate JSON format with the following items
-"kernel", "initram", "append" and "extra". The kexec command is composed in
-the following way:
-
-kexec --force --debug --append=$append --initrd=$initram $extra $kernel
-
-Please read kexec(8) man page for more information about semantics.
-Extra options like --reset-vga can be set via "extra" array.
+description: |
+  This template is used to pass command line options to kexec when reloading
+  kernel on a discovered host instead of rebooting. This is useful in PXE-less
+  environments. The template must generate JSON format with the following items
+  "kernel", "initram", "append" and "extra". The kexec command is composed in
+  the following way:
+  
+  kexec --force --debug --append=$append --initrd=$initram $extra $kernel
+  
+  Please read kexec(8) man page for more information about semantics.
+  Extra options like --reset-vga can be set via "extra" array.
 -%>
 <%
   mac = @host.facts['discovery_bootif']
@@ -47,9 +46,9 @@ Extra options like --reset-vga can be set via "extra" array.
   "initram": "<%= @initrd_uri %>",
 <% if (@host.operatingsystem.name == 'Fedora' and @host.operatingsystem.major.to_i > 16) or
     (@host.operatingsystem.name != 'Fedora' and @host.operatingsystem.major.to_i >= 7) -%>
-  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
+  "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% else -%>
-  "append": "ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
+  "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% end -%>
   "extra": []
 }

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "19.0.1"
+  VERSION = "19.0.4"
 end

data/test/unit/managed_extensions_test.rb

@@ -91,7 +91,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
 
     test "kexec template is correctly rendered" do
       expected = {
-        "append" => "ks=http://foreman.some.host.fqdn/unattended/provision&static=yes inst.ks.sendmac ip=::::::none nameserver= ksdevice=bootif BOOTIF= nomodeset nokaslr nomodeset",
+        "append" => "inst.ks=http://foreman.some.host.fqdn/unattended/provision&static=yes inst.ks.sendmac ip=::::::none nameserver= ksdevice=bootif BOOTIF= nomodeset nokaslr nomodeset",
         "extra" => []
       }
       assert @host.operatingsystem.respond_to?(:pxe_type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 19.0.1
+  version: 19.0.4
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -74,7 +74,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -201,51 +201,35 @@ files:
 - lib/foreman_discovery/engine.rb
 - lib/foreman_discovery/version.rb
 - locale/ca/LC_MESSAGES/foreman_discovery.mo
-- locale/ca/foreman_discovery.edit.po
 - locale/ca/foreman_discovery.po
 - locale/de/LC_MESSAGES/foreman_discovery.mo
-- locale/de/foreman_discovery.edit.po
 - locale/de/foreman_discovery.po
 - locale/en/LC_MESSAGES/foreman_discovery.mo
-- locale/en/foreman_discovery.edit.po
 - locale/en/foreman_discovery.po
 - locale/en_GB/LC_MESSAGES/foreman_discovery.mo
-- locale/en_GB/foreman_discovery.edit.po
 - locale/en_GB/foreman_discovery.po
 - locale/es/LC_MESSAGES/foreman_discovery.mo
-- locale/es/foreman_discovery.edit.po
 - locale/es/foreman_discovery.po
 - locale/foreman_discovery.pot
 - locale/fr/LC_MESSAGES/foreman_discovery.mo
-- locale/fr/foreman_discovery.edit.po
 - locale/fr/foreman_discovery.po
 - locale/gl/LC_MESSAGES/foreman_discovery.mo
-- locale/gl/foreman_discovery.edit.po
 - locale/gl/foreman_discovery.po
 - locale/it/LC_MESSAGES/foreman_discovery.mo
-- locale/it/foreman_discovery.edit.po
 - locale/it/foreman_discovery.po
 - locale/ja/LC_MESSAGES/foreman_discovery.mo
-- locale/ja/foreman_discovery.edit.po
 - locale/ja/foreman_discovery.po
 - locale/ko/LC_MESSAGES/foreman_discovery.mo
-- locale/ko/foreman_discovery.edit.po
 - locale/ko/foreman_discovery.po
-- locale/messages.mo
 - locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
-- locale/pt_BR/foreman_discovery.edit.po
 - locale/pt_BR/foreman_discovery.po
 - locale/ru/LC_MESSAGES/foreman_discovery.mo
-- locale/ru/foreman_discovery.edit.po
 - locale/ru/foreman_discovery.po
 - locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
-- locale/sv_SE/foreman_discovery.edit.po
 - locale/sv_SE/foreman_discovery.po
 - locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_CN/foreman_discovery.edit.po
 - locale/zh_CN/foreman_discovery.po
 - locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_TW/foreman_discovery.edit.po
 - locale/zh_TW/foreman_discovery.po
 - package.json
 - test/factories/discovery_host_related.rb
@@ -325,47 +309,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
 - test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
-- test/facts/default.json
+- test/test_plugin_helper.rb
+- test/unit/fact_to_category_resolver_test.rb
+- test/unit/discovery_taxonomy_extensions_test.rb
+- test/unit/discovered_extensions_test.rb
+- test/unit/discovery_attribute_set_test.rb
+- test/unit/discovered_mailer_test.rb
+- test/unit/fact_parser_test.rb
+- test/unit/lldp_neighbors_test.rb
+- test/unit/host_discovered_test.rb
+- test/unit/managed_extensions_test.rb
+- test/unit/ui_notifications/destroy_host_test.rb
+- test/unit/ui_notifications/new_host_test.rb
+- test/unit/discovery_rule_test.rb
+- test/test_helper_discovery.rb
 - test/facts/dell_npars.json
 - test/facts/dell_vlan.json
 - test/facts/facts_with_lldp.json
-- test/facts/pxeless-vlan.json
-- test/facts/regular_host.json
+- test/facts/default.json
 - test/facts/rhel-dl380-1kdisks.json
 - test/facts/rhel-r730.json
-- test/facts/rhel7-vlan.json
-- test/facts/simple-bond.json
-- test/facts/suse-vmware.json
+- test/facts/only-ipv6.json
 - test/facts/vmware_local.json
+- test/facts/regular_host.json
+- test/facts/rhel7-vlan.json
 - test/facts/bond0-eth0-eth1-active-passive.json
-- test/facts/facts_with_lldp_bond_candidate.json
-- test/facts/only-ipv6.json
 - test/facts/skylake-ipv6.json
-- test/functional/api/v2/discovery_rules_controller_test.rb
-- test/functional/api/v2/discovered_hosts_controller_test.rb
+- test/facts/pxeless-vlan.json
+- test/facts/suse-vmware.json
+- test/facts/facts_with_lldp_bond_candidate.json
+- test/facts/simple-bond.json
+- test/functional/discovered_hosts_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb
-- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
+- test/functional/api/v2/discovered_hosts_controller_test.rb
+- test/functional/api/v2/discovery_rules_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
-- test/functional/discovered_hosts_controller_test.rb
+- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/integration/discovered_hosts_test.rb
-- test/unit/ui_notifications/destroy_host_test.rb
-- test/unit/ui_notifications/new_host_test.rb
-- test/unit/discovered_mailer_test.rb
-- test/unit/discovery_taxonomy_extensions_test.rb
-- test/unit/lldp_neighbors_test.rb
-- test/unit/discovery_rule_test.rb
-- test/unit/fact_to_category_resolver_test.rb
-- test/unit/managed_extensions_test.rb
-- test/unit/host_discovered_test.rb
-- test/unit/discovered_extensions_test.rb
-- test/unit/discovery_attribute_set_test.rb
-- test/unit/fact_parser_test.rb
-- test/test_helper_discovery.rb
-- test/test_plugin_helper.rb