Merge pull request #18084 from d-m-u/call_create_automation_attrs_fro…

…m_objects_before_deliver_to_automate

Parse automation attrs correctly

(cherry picked from commit 3f9ac40)

https://bugzilla.redhat.com/show_bug.cgi?id=1632239

app/models/miq_retire_task.rb

@@ -34,7 +34,7 @@ def deliver_to_automate(req_type = request_type, zone = nil)
  :tenant_id => 1,
  }
 
- args[:attrs].merge!(MiqAeEngine.create_automation_attributes(source.class.base_model.name => source))
+ MiqAeEngine::set_automation_attributes_from_objects(source, args[:attrs])
 
  zone ||= source.respond_to?(:my_zone) ? source.my_zone : MiqServer.my_zone
  MiqQueue.put(