Set configuration_script in customize_request_task_attributes

agrare · Aug 26, 2024 · f4f29f5 · f4f29f5
1 parent b489fe3
commit f4f29f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/models/miq_request_task.rb b/app/models/miq_request_task.rb
@@ -140,13 +140,13 @@ def deliver_queue(req_type = request_type, zone = nil)
 
     _log.info("Queuing #{request_class::TASK_DESCRIPTION}: [#{description}]...")
 
-    workflow_id = resource_action&.configuration_script_id || options[:configuration_script_payload_id]
+    workflow_id = options[:configuration_script_payload_id]
     workflow    = ConfigurationScriptPayload.find(workflow_id) if workflow_id
     if workflow
       miq_task_id = workflow.run(:inputs => workflow_inputs, :userid => get_user.userid, :zone => zone, :object => self)
 
       options[:miq_task_id]                     = miq_task_id
-      options[:configuration_script_payload_id] = workflow_id
+      options[:configuration_script_payload_id] = workflow.id
       options[:configuration_script_id]         = MiqTask.find(miq_task_id).context_data[:workflow_instance_id]
       save!
     elsif self.class::AUTOMATE_DRIVES

diff --git a/app/models/service_template_provision_request.rb b/app/models/service_template_provision_request.rb
@@ -57,6 +57,12 @@ def requested_task_idx
 
   def customize_request_task_attributes(req_task_attrs, idx)
     req_task_attrs['options'][:pass] = idx
+    configuration_script_id = ResourceAction.find(options[:workflow_settings][:resource_action_id]).configuration_script_id
+    if source.prov_type == "generic"
+      req_task_attrs['options'][:configuration_script_payload_id] = configuration_script_id
+    else
+      req_task_attrs['options'][:parent_configuration_script_payload_id] = configuration_script_id
+    end
   end
 
   def originating_controller