diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb index 9fe5e2c120..8985dfc979 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/importer.rb @@ -57,16 +57,14 @@ def self.import_wild(host_id, vm_ref, one_vm, template) dc_ref = vcenter_vm.get_dc.item._ref ds_ref = template.match(/^VCENTER_DS_REF *= *"(.*)" *$/)[1] - begin - ds_one = dpool.select do |e| - e["TEMPLATE/TYPE"] == "SYSTEM_DS" && - e["TEMPLATE/VCENTER_DS_REF"] == ds_ref && - e["TEMPLATE/VCENTER_DC_REF"] == dc_ref && - e["TEMPLATE/VCENTER_INSTANCE_ID"] == vc_uuid - end.first - rescue - raise "DS with ref #{ds_ref} is not imported in OpenNebula, aborting Wild VM import." - end + ds_one = dpool.select do |e| + e["TEMPLATE/TYPE"] == "SYSTEM_DS" && + e["TEMPLATE/VCENTER_DS_REF"] == ds_ref && + e["TEMPLATE/VCENTER_DC_REF"] == dc_ref && + e["TEMPLATE/VCENTER_INSTANCE_ID"] == vc_uuid + end.first + + raise "DS with ref #{ds_ref} is not imported in OpenNebula, aborting Wild VM import." if !ds_one rc = one_vm.allocate(template) return rc if OpenNebula.is_error?(rc)