foreman_salt 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11345f1f98edc5fa4ac8b668621a0fa990234c15
-  data.tar.gz: f1b379fdc8efbf91caefa1fcc5799b030754b85a
+  metadata.gz: 2f3f97f7067977ffca23c926e798efc4a29d240d
+  data.tar.gz: e2f771a0dcf32c7077bb1ac66bd0521f7d784713
 SHA512:
-  metadata.gz: be3751c141bb852c3024f95ac6b3271eb1c4dc2e9fc152246c18527df70147b9e59304304ab2d22f10aa105f5ea6dff99506889a5156be208e65575349066553
-  data.tar.gz: 603c15f190f327510c48b4022ae47555cacf336dfa4e988224b4902ef6453a18044aa1267f8380b59313e4cb49a43ec57225810631e487f0ea18ae1dad22f436
+  metadata.gz: da42071ca83b47261517336c59ed9218d797169a3a4d142e36bfe6e423275bee81fca4d5f21886475b77ae79a182b695dad8e533c649e7fc16a6b5f0a0aaef03
+  data.tar.gz: 6b08a1effbccba43df1ea0721488ca8c28467468994f3b102bdbf14c8d8c6be14873710dfbe9a2d0e85623d8e3d211a90e9b4186390bc1e4094d744b65fad9c8

data/app/controllers/foreman_salt/api/v2/jobs_controller.rb

@@ -22,14 +22,8 @@ module ForemanSalt
           Rails.logger.info("Processing job #{params[:job][:job_id]} from Salt.")
           case params[:job][:function]
           when 'state.highstate'
-            # Dynflowize the action if we can, otherwise we'll do it live
-            if defined? ForemanTasks
-              task = ForemanTasks.async_task(::Actions::ForemanSalt::ReportImport, params[:job], detected_proxy.try(:id))
-              render :json => { :task_id => task.id }
-            else
-              reports = ForemanSalt::ReportImporter.import(params[:job][:result], detected_proxy.try(:id))
-              render :json => { :message => "Imported #{reports.count} new reports." }
-            end
+            task = ForemanTasks.async_task(::Actions::ForemanSalt::ReportImport, params[:job], detected_proxy.try(:id))
+            render :json => { :task_id => task.id }
           else
             render :json => { :message => 'Unsupported function' }, :status => :unprocessable_entity
           end

data/app/lib/actions/foreman_salt/report_import.rb

@@ -1,27 +1,25 @@
 module Actions
   module ForemanSalt
-    if defined? ForemanTasks
-      class ReportImport < Actions::EntryAction
-        def resource_locks
-          :report_import
-        end
+    class ReportImport < Actions::EntryAction
+      def resource_locks
+        :report_import
+      end
 
-        def plan(job, proxy_id)
-          plan_self(:job_id => job[:job_id], :report => job[:result], :proxy_id => proxy_id)
-        end
+      def plan(job, proxy_id)
+        plan_self(:job_id => job[:job_id], :report => job[:result], :proxy_id => proxy_id)
+      end
 
-        def run
-          ::User.as_anonymous_admin do
-            reports = ::ForemanSalt::ReportImporter.import(input[:report], input[:proxy_id])
+      def run
+        ::User.as_anonymous_admin do
+          reports = ::ForemanSalt::ReportImporter.import(input[:report], input[:proxy_id])
 
-            output[:state] = { :message => "Imported #{reports.count} new reports" }
-            output[:hosts] = reports.map { |report| report.host.name }
-          end
+          output[:state] = { :message => "Imported #{reports.count} new reports" }
+          output[:hosts] = reports.map { |report| report.host.name }
         end
+      end
 
-        def humanized_name
-          _("Process Highstate Report: #{input[:job_id]}")
-        end
+      def humanized_name
+        _("Process Highstate Report: #{input[:job_id]}")
       end
     end
   end

data/lib/foreman_salt/engine.rb

@@ -9,10 +9,8 @@ module ForemanSalt
     config.autoload_paths += Dir["#{config.root}/app/services"]
     config.autoload_paths += Dir["#{config.root}/app/lib"]
 
-    if defined? ForemanTasks
-      initializer 'foreman_salt.require_dynflow', :before => 'foreman_tasks.initialize_dynflow' do |_app|
-        ForemanTasks.dynflow.require!
-      end
+    initializer 'foreman_salt.require_dynflow', :before => 'foreman_tasks.initialize_dynflow' do |_app|
+      ForemanTasks.dynflow.require!
     end
 
     initializer 'foreman_salt.load_default_settings', :before => :load_config_initializers do

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -24,6 +24,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: foreman-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.9
 description: Foreman Plug-in for Salt
 email:
 - stephen@redhat.com