foreman-tasks 0.7.4 → 0.7.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzAzZDZlZGRhYjg2OWM2ZGU3NTdkMGMzMmZmMTg4ZDJhODU3NjU3NA==
+    ZmZhMjBlOGVlMDU5NDI1NjNhZWRhNDM3Mjk5MzM3NTdhOTI4ZWE2MQ==
   data.tar.gz: !binary |-
-    NzQ1ZDRmODAwYzg3ODhhNThjMGVmNmQyZDQwNDA3NDliNjVkYjYxNQ==
+    MmFkYzY1MzcxOTZiNTgxMzUyNjAxZTI4ZDYyOWI2N2FlOGVmMzA5Mw==
 SHA512:
   metadata.gz: !binary |-
-    N2U4ZmQ0ZTE4MTZkNDlmMWRmYmEzYThhODJiYWQwZTEyOTQyY2Q3MWZjMzM1
-    NDJlNjQ1YWNjNWU5ODgzZmE3NjVmN2Q0Y2YzMGI4Y2NlZjZkN2RmODcyYzRk
-    ODc5Y2FlNWQ5ZDE3YjlmODYyMWYzYTI3YTljOWIxMTdmOWYwMzE=
+    YzIwNTJlMmY5MGVmNWY4OWM2MWMwNjFhODkzZjkzZTFmMDZlYjcyMjI1YjIz
+    YzQ2ZjE0YTFlZDgzYTM4MjQ5Njk5ZmJjZmU5ZTJhY2Y0Y2E3M2M2NDFkOTdl
+    ZTQ5N2ZhMTg4MTA1YWQ3OTIyMjFlY2I1MjgxMDBiNjQ1NWQxNzk=
   data.tar.gz: !binary |-
-    YTU2ZjFlNTY2ZjI3MzA5ZmMxMWQ2YzQzMDQxMTZjMjY3NDExMjNmNjVlZjkz
-    ZjJhOGRlODk5OTgxOGIyZDI0NzE0YjY3ZmFhZDQxNmE4NGFlYWQ4Y2Q3ZWMw
-    MTY5MWMwNjMzNDVlOWJiMzE2YWZjMTgwZjc0NDZkZjYyNmE2MWY=
+    ZTI2YjJjYzc4NzUwZjA1YWIzMzNlZDIxNTk0OTFiZGU5NDZkYzQzNjgyNjE3
+    MGVkODE5ODdjMDhmODlmYWQ5YzI3MGU2ZjZmYzM2NjE2NGYyODA3N2FhNDkx
+    NDRkZGNlNzJhNTE5YzczMDIyYjBhOGU5OGY2NjkwZGFjYzA4ZTg=

data/app/lib/actions/proxy_action.rb

@@ -55,14 +55,14 @@ module Actions
     def check_task_status
       if output[:proxy_task_id]
         response = proxy.status_of_task(output[:proxy_task_id])
-        if response['state'] == 'stopped'
+        if %w(stopped paused).include? response['state']
           if response['result'] == 'error'
             raise ::Foreman::Exception, _("The smart proxy task '#{output[:proxy_task_id]}' failed.")
           else
             on_data(response['actions'].find { |block_action| block_action['class'] == proxy_action_name }['output'])
           end
         else
-          cancel_proxy_task
+          suspend
         end
       else
         process_timeout
@@ -129,7 +129,9 @@ module Actions
     def default_connection_options
       # Fails if the plan is not finished within 60 seconds from the first task trigger attempt on the smart proxy
       # If the triggering fails, it retries 3 more times with 15 second delays
-      { :retry_interval => 15, :retry_count => 4, :timeout => 60 }
+      { :retry_interval => Setting['foreman_tasks_proxy_action_retry_interval'] || 15,
+        :retry_count    => Setting['foreman_tasks_proxy_action_retry_count' ]   || 4,
+        :timeout        => Setting['foreman_tasks_proxy_action_start_timeout']  || 60 }
     end
 
     private

data/app/lib/proxy_api/foreman_dynflow/dynflow_proxy.rb

@@ -30,6 +30,10 @@ module ProxyAPI
       def status_of_task(proxy_task_id)
         MultiJson.load(Task.new(@args).send(:get, "#{ proxy_task_id }/status"))
       end
+
+      def tasks_count(state)
+        MultiJson.load(Task.new(@args).send(:get, "count?state=#{state}"))['count'].to_i
+      end
     end
   end
 end

data/app/models/setting/foreman_tasks.rb

@@ -8,7 +8,10 @@ class Setting::ForemanTasks < Setting
       [
           self.set('dynflow_allow_dangerous_actions', N_("Allow unlocking actions which can have dangerous consequences."), false),
           self.set('dynflow_enable_console', N_("Enable the dynflow console (/foreman_tasks/dynflow) for debugging"), true),
-          self.set('dynflow_console_require_auth', N_("Require user to be authenticated as user with admin rights when accessing dynflow console"), true)
+          self.set('dynflow_console_require_auth', N_("Require user to be authenticated as user with admin rights when accessing dynflow console"), true),
+          self.set('foreman_tasks_proxy_action_retry_count', N_("Number of attempts to start a task on the smart proxy before failing"), 4),
+          self.set('foreman_tasks_proxy_action_retry_interval', N_("Time in seconds between retries"), 15),
+          self.set('foreman_tasks_proxy_action_start_timeout', N_("Time in second during which a task has to be started on the proxy"), 60)
       ].each { |s| self.create! s.update(:category => "Setting::ForemanTasks")}
     end
 

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow