Revert "Merge pull request #19416 from fdupont-redhat/v2v_pin_infraco…

…nversionjob_to_server" This reverts commit 5bfdeea. https://bugzilla.redhat.com/show_bug.cgi?id=1768532
ManageIQ · Dec 3, 2019 · 7927494 · 7927494
1 parent 707df01
commit 7927494
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/app/models/infra_conversion_job.rb b/app/models/infra_conversion_job.rb
@@ -244,8 +244,7 @@ def queue_signal(*args, deliver_on: nil)
       :zone        => zone,
       :task_id     => guid,
       :args        => args,
-      :deliver_on  => deliver_on,
-      :server_guid => MiqServer.my_server.guid
+      :deliver_on  => deliver_on
     )
   end
 

diff --git a/spec/models/infra_conversion_job_spec.rb b/spec/models/infra_conversion_job_spec.rb
@@ -3,7 +3,6 @@
   let(:user_admin)            { FactoryBot.create(:user_admin) }
   let(:group)                 { FactoryBot.create(:miq_group) }
   let(:zone)                  { FactoryBot.create(:zone) }
-  let(:server)                { FactoryBot.create(:miq_server) }
 
   let(:ems_vmware)            { FactoryBot.create(:ems_vmware, :zone => zone) }
   let(:ems_cluster_vmware)    { FactoryBot.create(:ems_cluster, :ext_management_system => ems_vmware) }
@@ -75,7 +74,6 @@
 
   before do
     allow(MiqServer).to receive(:my_zone).and_return(zone.name)
-    allow(MiqServer).to receive(:my_server).and_return(server)
     allow(ServiceTemplateProvisionRequest).to receive(:destination)
   end