Project

General

Profile

« Previous | Next » 

Revision 4c512942

Added by Ivan Necas about 8 years ago

Fixes #13986 - don't use image unless in image provisioning method

View differences:

app/models/concerns/orchestration/compute.rb
end
def validate_compute_provisioning
return true unless image_build?
return true if ( compute_attributes.nil? or (compute_attributes[:image_id] || compute_attributes[:image_ref]).blank? )
img = find_image
if img
self.image = img
return true if compute_attributes.nil?
if image_build?
return true if (compute_attributes[:image_id] || compute_attributes[:image_ref]).blank?
img = find_image
if img
self.image = img
else
failure(_("Selected image does not belong to %s") % compute_resource) and return false
end
else
failure(_("Selected image does not belong to %s") % compute_resource) and return false
# don't send the image information to the compute resource unless using the image provisioning method
[:image_id, :image_ref].each { |image_key| compute_attributes.delete(image_key) }
end
end

Also available in: Unified diff