From 518a39c1072eefb09d15d026ec53236deeb9507a Mon Sep 17 00:00:00 2001 From: Dominic Cleal Date: Tue, 29 Apr 2014 10:14:05 +0100 Subject: [PATCH] fixes #4590 - convert VMware SCSI controller type during creation (cherry picked from commit 13461a313aa959cadf8841462b5e92d1813f9ed4) Conflicts: app/models/compute_resources/foreman/model/vmware.rb test/unit/compute_resources/vmware_test.rb --- app/models/compute_resources/foreman/model/vmware.rb | 4 ++++ app/models/concerns/fog_extensions/vsphere/server.rb | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/compute_resources/foreman/model/vmware.rb b/app/models/compute_resources/foreman/model/vmware.rb index bd4ec9f81b6..416960f66ae 100644 --- a/app/models/compute_resources/foreman/model/vmware.rb +++ b/app/models/compute_resources/foreman/model/vmware.rb @@ -100,6 +100,10 @@ def new_vm attr={ } opts[collection] = nested_attributes_for(collection, nested_attrs) if nested_attrs end + if opts[:scsi_controller_type].present? + opts[:scsi_controller] = {:type => opts.delete(:scsi_controller_type)} + end + opts.reject! { |k, v| v.nil? } client.servers.new opts diff --git a/app/models/concerns/fog_extensions/vsphere/server.rb b/app/models/concerns/fog_extensions/vsphere/server.rb index 06d1d9c5b46..55298610688 100644 --- a/app/models/concerns/fog_extensions/vsphere/server.rb +++ b/app/models/concerns/fog_extensions/vsphere/server.rb @@ -32,10 +32,6 @@ def scsi_controller_type scsi_controller.type end - def scsi_controller_type= type - scsi_controller[:type] = type - end - end end end