Fixes #34344 - Add support for halting

Requires Dynflow/dynflow#406
theforeman · Jan 28, 2022 · 8cfa9df · 8cfa9df
1 parent 831bd3f
commit 8cfa9df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/app/controllers/foreman_tasks/tasks_controller.rb b/app/controllers/foreman_tasks/tasks_controller.rb
@@ -72,18 +72,14 @@ def resume
     def unlock
       task = find_dynflow_task
       if task.paused?
-        task.state = :stopped
-        task.save!
-        render json: { statusText: 'OK' }
+        force_unlock(task)
       else
         render json: {}, status: :bad_request
       end
     end
 
-    def force_unlock
-      task       = find_dynflow_task
-      task.state = :stopped
-      task.save!
+    def force_unlock(task = find_dynflow_task)
+      task.halt
       render json: { statusText: 'OK' }
     end
 

diff --git a/app/models/foreman_tasks/task/dynflow_task.rb b/app/models/foreman_tasks/task/dynflow_task.rb
@@ -246,6 +246,10 @@ def self.model_name
       superclass.model_name
     end
 
+    def halt
+      ::ForemanTasks.dynflow.world.halt(external_id)
+    end
+
     private
 
     def string_to_time(zone, time)

diff --git a/foreman-tasks.gemspec b/foreman-tasks.gemspec
@@ -26,7 +26,7 @@ same resource. It also optionally provides Dynflow infrastructure for using it f
   s.test_files = `git ls-files test`.split("\n")
   s.extra_rdoc_files = Dir['README*', 'LICENSE']
 
-  s.add_dependency "dynflow", '>= 1.6.0'
+  s.add_dependency "dynflow", '>= 1.7.0'
   s.add_dependency "get_process_mem" # for memory polling
   s.add_dependency "parse-cron", '~> 0.1.4'
   s.add_dependency "sinatra" # for Dynflow web console