Change the role for Service provisioning create_request_tasks MiqQueue.put.

app/models/miq_request.rb

@@ -429,7 +429,7 @@ def execute
       :instance_id    => id,
       :method_name    => "create_request_tasks",
       :zone           => options.fetch(:miq_zone, my_zone),
-      :role           => my_role,
+      :role           => kind_of?(ServiceTemplateProvisionRequest) ? 'automate' : my_role,
       :tracking_label => tracking_label_id,
       :msg_timeout    => 3600,
       :deliver_on     => deliver_on

spec/models/miq_request_spec.rb

@@ -315,6 +315,38 @@ def approvals
     end
   end
 
+  context '#execute' do
+    shared_examples_for "#calls create_request_tasks with the proper role" do
+      it "runs successfully" do
+        expect(request).to receive(:approved?).and_return(true)
+        expect(MiqQueue.count).to eq(0)
+
+        request.execute
+        expect(MiqQueue.count).to eq(1)
+        expect(MiqQueue.first.role).to eq(role)
+      end
+    end
+
+    context 'Service provisioning' do
+      let(:request) { FactoryGirl.create(:service_template_provision_request, :approval_state => 'approved', :requester => fred) }
+      let(:role)    { 'automate' }
+
+      context "uses the automate role" do
+        it_behaves_like "#calls create_request_tasks with the proper role"
+      end
+    end
+
+    context 'VM provisioning' do
+      let(:template) { FactoryGirl.create(:template_vmware, :ext_management_system => FactoryGirl.create(:ems_vmware_with_authentication)) }
+      let(:request)  { FactoryGirl.build(:miq_provision_request, :requester => fred, :src_vm_id => template.id).tap(&:valid?) }
+      let(:role)     { 'ems_operations' }
+
+      context "uses the ems_operations role" do
+        it_behaves_like "#calls create_request_tasks with the proper role"
+      end
+    end
+  end
+
   context '#post_create_request_tasks' do
     context 'VM provisioning' do
       before do