foreman_discovery 26.0.2 → 26.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ecae6ce5239a492987646af6697d50d04d8350fba1b5b87093e1b366d8c6957
-  data.tar.gz: 9767c5970e4797e977c5c1e6d9ed05be9c862635712d7ddcc0dac0139ca5969a
+  metadata.gz: e90157d36e1ea37c8275996fb86a182fdf1f8eb20924bdef5a4b7cc6e8a21099
+  data.tar.gz: 39bd25814b3cd8c0bdc969376b13cf25e63992a113a140b01585611c3ace7074
 SHA512:
-  metadata.gz: c007823f0269a05c68cc983a44b8a331949be9b7c164287b130ec30f213747607889db746655e363c2bff6bdf71a9bb9ad1c7487acc39465bbb6bedf8742c7e1
-  data.tar.gz: 61d9a899e88eec05b6403a8e00b1fd2f04c6abd5d7e2ded4415c2ef311668d7ca2c4dbe70c8f8370e8f5ac8fc611fae9b41f60b9462a595d018afa3117581160
+  metadata.gz: 4bad020350128852a549969f4d79b36a3d2c50f2e3a4de94eb338ddf17a5fe80ce999b5acb21eaebc3051f8a91300e5a5f97ecce13619b517b08563fa8fcc7e5
+  data.tar.gz: 4aaabbb5b7cebfe19d9537178d3cd745b3ce6e4333b78a237c151fcc8d37370290d35ac4006f11e41102cc75ca92009f918c3c49a487e413262fad07c6dc72a9

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

@@ -21,7 +21,6 @@ module ForemanDiscovery
       end
     end
 
-    # rubocop:disable Metrics/BlockLength
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       app.reloader.to_prepare do
         Foreman::Plugin.register :foreman_discovery do
@@ -149,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,
@@ -332,7 +324,6 @@ module ForemanDiscovery
         end
       end
     end
-    # rubocop:enable Metrics/BlockLength
 
     initializer "foreman_discovery.apipie" do
       if Apipie.configuration.respond_to?(:checksum_path)

data/lib/foreman_discovery/version.rb

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

data/test/test_helper_discovery.rb

@@ -62,7 +62,6 @@ def set_default_settings
   Setting['discovery_clean_facts'] = false
   Setting['discovery_lock'] = false
   Setting['discovery_pxelinux_lock_template'] = 'pxelinux_discovery'
-  Setting['discovery_pxegrub_lock_template'] = 'pxegrub_discovery'
   Setting['discovery_pxegrub2_lock_template'] = 'pxegrub2_discovery'
   Setting['discovery_always_rebuild_dns'] = true
   Setting['discovery_error_on_existing'] = false

data/test/unit/host_discovered_test.rb

@@ -202,7 +202,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
                                   :locations => [location_one]
       )
       Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
-      ProxyAPI::TFTP.any_instance.expects(:set).with(anything, 'e4:1f:13:cc:36:58', anything).returns(true).times(3)
+      ProxyAPI::TFTP.any_instance.expects(:set).with(anything, 'e4:1f:13:cc:36:58', anything).returns(true).times(2)
       TemplateKind::PXE.each do |kind|
         ProvisioningTemplate.where(:name => "#{kind.downcase}_discovery").first_or_create(
             :template_kind_id => template_kinds(kind.downcase.to_sym),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 26.0.2
+  version: 26.1.0
 platform: ruby
 authors:
 - Aditi Puntambekar