foreman-tasks 0.7.15 → 0.7.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be3e1a5011a42e938ce2948393198a9987bb9824
-  data.tar.gz: 5124c56918697f1702f67991848f1114439219b3
+  metadata.gz: 31ae188eb51b073634a6022419eca1a9da0386ae
+  data.tar.gz: ac58624747c4767a2a6281a5b528bd7bec73cdfc
 SHA512:
-  metadata.gz: 31373ad538d4fbed7d7f1c2817e38f58186d57f109bf3fab06fd86e8fb8eb0319989d877be4bac35ee52972273727c276accd10f7589d26e9aa7a9b25d5c45b2
-  data.tar.gz: 37315583adcdcb91cdcbbf4ed42e32a589631d743c11305b23d453f44ed8b6117ca0f03e4a450bdd68c6f2cb3130c5cc044507e26f4f98a6a6e5140bbd70e7de
+  metadata.gz: 6ee4441852726080335eed0f0b98b50a90aab99cebeacc774bff9e213068d4d6853338007d7b589a04703f96abd6792721a186536e48d58281f758ed1cb48655
+  data.tar.gz: 2989a4a292c841fcc829f9b3882edb3702915a0e40f32115c722fde27bf74c9f68507830df9938643c9f98a6673d58b6abd786a73f220c3d4114eda9225d7cb1

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

@@ -9,9 +9,14 @@ module Actions
         end
 
         def plan(host_type, host_name, facts, certname, proxy_id)
-          host = ::Host::Base.importHost(host_name, certname, proxy_id)
+          facts['domain'].try(:downcase!)
+          host = ::Host::Base.import_host(host_name, certname, facts, proxy_id)
           action_subject(host, :facts => facts)
-          plan_self
+          if host.build?
+            ::Foreman::Logging.logger('foreman-tasks').info "Skipping importing of facts for #{host.name} because it's in build mode"
+          else
+            plan_self
+          end
         end
 
         def run

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

@@ -8,6 +8,8 @@ module ForemanTasks
         after_create :plan_create_action
         after_update :plan_update_action
         after_destroy :plan_destroy_action
+
+        alias_method_chain :save, :dynflow_task_wrap
       end
 
       # @override
@@ -22,8 +24,9 @@ module ForemanTasks
       def destroy_action
       end
 
-      def save(*args)
-        dynflow_task_wrap(:save) { super(*args) }
+
+      def save_with_dynflow_task_wrap(*args)
+        dynflow_task_wrap(:save) { save_without_dynflow_task_wrap(*args) }
       end
 
       def save!(*args)

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

@@ -15,26 +15,29 @@ module ForemanTasks
       module ClassMethods
         # TODO: This should get into the Foreman core, extracting the
         # +importHostAndFacts+ method into two
-        def importHost(hostname, certname, proxy_id = nil)
+        def import_host(hostname, certname, facts, proxy_id = nil)
+          raise(::Foreman::Exception.new("Invalid Facts, must be a Hash")) unless facts.is_a?(Hash)
           raise(::Foreman::Exception.new("Invalid Hostname, must be a String")) unless hostname.is_a?(String)
 
           # downcase everything
           hostname.try(:downcase!)
           certname.try(:downcase!)
 
-          host = certname.present? ? Host.where(:certname => certname).first : nil
-          host ||= Host.where(:name => hostname).first
+          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]
-          if host
-            # 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, use it.
+
+          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
-            host.save(:validate => false)
-            return host
-          else
-            return
           end
+
+          host.save(:validate => false) if host.new_record?
+          host
         end
       end
     end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.15"
+  VERSION = "0.7.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users
@@ -265,3 +265,4 @@ test_files:
 - test/unit/recurring_logic_test.rb
 - test/unit/task_groups_test.rb
 - test/unit/task_test.rb
+has_rdoc: