foreman_discovery 18.0.4 → 18.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b89780a685ba935e63141f155eb8c1e5baaa4f9b36e4e71ac56c6eba33f11f26
-  data.tar.gz: 741a2c3b783fa20c2cea7450b359b91583fc7da6e7b3e441e6121d3b9bea910f
+  metadata.gz: 1a6708c354c29e3e5f53cf0368d5e3fbaa2b478a61f54c8fd93a321e24f45df7
+  data.tar.gz: f1ba15c2d1c069dd694ec9356765c78eb58b8b1fb9b41f28d5d33722c074017b
 SHA512:
-  metadata.gz: de3dad2c43932edc1e6a0974094f7baa6608a4c25c0020a67dfa8db0ef1f6d2fb54c7d07e314951975658a659cc671a1f7977c255efd3d0bc243ccca4a35c526
-  data.tar.gz: ecdd28f538746981a162697f622861abf43513d3fdcbc5eaf5fda23fbebd73bfbd7334872396a52ac91a7cf17a4e1ef8784c89f5a33c523ac920d024b2aa78ab
+  metadata.gz: 910af2e79a1ddde6022df9a851eabc357da0f79e2d7bae2c1106c8413cab21b70dd9a1e6b0f5c66ecedb2c39a3a768f19f071962b9d28a46e66556489f374fe0
+  data.tar.gz: ff026ad7368f99a13e847263771c8f5e53ae6f9ee756b52d2ea3cb51b61219f6184f2600d216c534fe74c8c19dcb807e8c146881083c78a98adecb5a4ad74eb3

data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb

@@ -1,6 +1,9 @@
 module Foreman::Controller::Parameters::DiscoveredHost
   extend ActiveSupport::Concern
   include Foreman::Controller::Parameters::Host
+  if defined?(ForemanPuppet)
+    include ForemanPuppet::Extensions::ParametersHost
+  end
 
   class_methods do
     def discovered_host_params_filter
@@ -9,23 +12,32 @@ module Foreman::Controller::Parameters::DiscoveredHost
 
         add_host_base_params_filter(filter)
         add_host_common_params_filter(filter)
+        add_host_puppet_params_filter(filter) if defined?(ForemanPuppet)
       end
     end
   end
 
   def discovered_host_params
-    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def discovered_host_params_host
-    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def managed_host_params_host
-    self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def managed_host_params
-    self.class.host_params_filter.filter_params(params, parameter_filter_context)
+    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 end

data/app/controllers/discovered_hosts_controller.rb

@@ -15,7 +15,10 @@ class DiscoveredHostsController < ::ApplicationController
 
   helper :hosts
   if defined?(ForemanPuppet)
+    helper ForemanPuppet::HostsHelper
     helper ForemanPuppet::HostsAndHostgroupsHelper
+    helper ForemanPuppet::PuppetclassesHelper
+    helper ForemanPuppet::PuppetclassLookupKeysHelper
   end
 
   layout 'layouts/application'

data/app/services/foreman_discovery/subnet_suggestion.rb

@@ -14,7 +14,14 @@ module ForemanDiscovery
     def call
       return unless ip
 
-      subnet = Subnet.unscoped.subnet_for(ip)
+      begin
+        subnet = Subnet.unscoped.subnet_for(ip)
+      rescue Exception => e
+        Rails.logger.error "Error while detecting subnet for IP #{ip}"
+        Foreman::Logging.exception "Unable to detect subnet", e
+        subnet = nil
+      end
+
       if subnet
         Rails.logger.info "Detected #{kind} subnet: #{subnet} with taxonomy #{subnet.organizations.collect(&:name)}/#{subnet.locations.collect(&:name)}"
       else

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "18.0.4"
+  VERSION = "18.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 18.0.4
+  version: 18.0.5
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -74,7 +74,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com