On 02/23/2012 03:10 PM, Scott Seago wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=796783
lib/aeolus_image/import.rb | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/aeolus_image/import.rb b/lib/aeolus_image/import.rb index fe0ce22..2e5a9d2 100644 --- a/lib/aeolus_image/import.rb +++ b/lib/aeolus_image/import.rb @@ -14,7 +14,7 @@
module Aeolus module Image
- def self.import(provider_name, deltacloud_driver, image_id, account_id, xml=nil)
- def self.import(provider_name, deltacloud_driver, image_id, account_id, environment, xml=nil) xml ||= "<image><name>#{image_id}</name></image>" image = Factory::Image.new( :target_name => deltacloud_driver,
@@ -25,7 +25,8 @@ module Aeolus image.save! # Set the provider_account_id on the image iwhd_image = Warehouse::Image.find(image.id)
# Set the account on the provider image
iwhd_image.set_attr("environment", environment)
# Set the account on the provider image # This assumes (as is currently correct) that there will only be one provider image for imported images pimg = iwhd_image.provider_images.first pimg.set_attr('provider_account_identifier', account_id)
Ack and pushed.