foreman-tasks 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae915bf659a976d2dfcac1f2e51cb0a447d080a8
-  data.tar.gz: 41bf2fb543e2ba405f828be97d0727ff9ec73c17
+  metadata.gz: f9103450a91bdc6f9bee1c15d50063375050da83
+  data.tar.gz: be2ba86f7efd177e77839d2dc03f2e14ea2daebe
 SHA512:
-  metadata.gz: 3b641565b6e1360887774df9489089c2e5e960d299b976140f307b15e2b8e7d92815900541124265eead2a6294a57fae798371bab3074f4026f71cc6298ce6f4
-  data.tar.gz: b9304f40c6ab2f54a37bc92f93d68e6fb81f3cae68e63d5299994f9e5a5c1bc466d3d081e6047067cac2901e3664e58734421549c3892f2fce400347f871d7ac
+  metadata.gz: 6dbf21fc4596c5953fdef37ca2e45beb32d267a39fd895e5f055d641feae0b113d474d632cb2d6a41c16d789dc584634511be8b5a39dbfdcf5e9e57a26288ffd
+  data.tar.gz: 1ee999e8e037c53781e9afe746864fe78c894774f4bc32df820db53397bdbb5739aa1d99c1baf3f7094b7f4234b5c85a91076c58977938fcea20315caf75373a

data/app/lib/actions/foreman/host/import_facts.rb

@@ -8,7 +8,13 @@ module Actions
 
         def plan(_host_type, host_name, facts, certname, proxy_id)
           facts['domain'].try(:downcase!)
-          host = ::Host::Base.import_host(host_name, certname, facts, proxy_id)
+          host = if SETTINGS[:version] > '1.16'
+                   ::Host::Base.import_host(host_name, certname, proxy_id)
+                 else
+                   # backwards compatibility
+                   ::Host::Managed.import_host(host_name, facts['_type'], certname, proxy_id)
+                 end
+          host.save(:validate => false) if host.new_record?
           action_subject(host, :facts => facts)
           if host.build?
             ::Foreman::Logging.logger('foreman-tasks').info "Skipping importing of facts for #{host.name} because it's in build mode"

data/app/models/foreman_tasks/concerns/host_action_subject.rb

@@ -11,35 +11,6 @@ module ForemanTasks
       def available_locks
         [:read, :write, :import_facts]
       end
-
-      module ClassMethods
-        # TODO: This should get into the Foreman core, extracting the
-        # +importHostAndFacts+ method into two
-        def import_host(hostname, certname, facts, proxy_id = nil)
-          raise Foreman::Exception, 'Invalid Facts, must be a Hash' unless facts.is_a?(Hash)
-          raise Foreman::Exception, 'Invalid Hostname, must be a String' unless hostname.is_a?(String)
-
-          # downcase everything
-          hostname.try(:downcase!)
-          certname.try(:downcase!)
-
-          host = certname.present? ? Host.find_by(certname: certname) : nil
-          host ||= Host.find_by name: hostname
-          host ||= Host.new(:name => hostname, :certname => certname) if Setting[:create_new_host_when_facts_are_uploaded]
-
-          return Host.new if host.nil?
-          # if we were given a certname but found the Host by hostname we should update the certname
-          host.certname = certname if certname.present?
-          # if proxy authentication is enabled and we have no puppet proxy set and the upload came from puppet,
-          # use it as puppet proxy.
-          if facts['_type'].blank? || facts['_type'] == 'puppet'
-            host.puppet_proxy_id ||= proxy_id
-          end
-
-          host.save(:validate => false) if host.new_record?
-          host
-        end
-      end
     end
   end
 end

data/lib/foreman_tasks/dynflow/configuration.rb

@@ -1,6 +1,4 @@
-# Require foreman's lib directory which contains foreman/dynflow/configuration
-lib_foreman = File.expand_path('lib/foreman', Rails.root)
-require lib_foreman if Dir.exist?(lib_foreman)
+require File.expand_path('lib/foreman/dynflow/configuration', Rails.root)
 require 'foreman_tasks/dynflow/persistence'
 
 module ForemanTasks

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '0.10.3'.freeze
+  VERSION = '0.10.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core