Merge pull request #618 from lfu/automate_timeout_orchestration_servi…

…ce_1781353 Use automate timeout when execution_ttl is not set for an orchestration service (cherry picked from commit 73cf178) https://bugzilla.redhat.com/show_bug.cgi?id=1794752
ManageIQ · Jan 24, 2020 · 7f63038 · 7f63038
1 parent 58c3ea4
commit 7f63038
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/...eIQ/Cloud/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/provision.rb b/...eIQ/Cloud/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/provision.rb
@@ -17,6 +17,7 @@ def main
 
                 task = @handle.root["service_template_provision_task"]
                 service = task.destination
+                service.set_automate_timeout(@handle.field_timeout, 'provision')
 
                 begin
                   stack = service.deploy_orchestration_stack

diff --git a/...loud/Orchestration/Reconfiguration/StateMachines/Methods.class/__methods__/reconfigure.rb b/...loud/Orchestration/Reconfiguration/StateMachines/Methods.class/__methods__/reconfigure.rb
@@ -6,6 +6,7 @@
 
 task = $evm.root["service_reconfigure_task"]
 service = task.source
+service.set_automate_timeout(@handle.field_timeout, 'reconfigure')
 
 begin
   service.update_orchestration_stack

diff --git a/...loud/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/provision_spec.rb b/...loud/Orchestration/Provisioning/StateMachines/Methods.class/__methods__/provision_spec.rb
@@ -34,6 +34,7 @@
       current_object = Spec::Support::MiqAeMockObject.new
       current_object.parent = root_object
       service.object = current_object
+      allow(service).to receive(:field_timeout).and_return(8)
     end
   end