[PATCH Conductor] Bug 796783: fixes lingering errors w/ image import

Scott Seago sseago at redhat.com
Thu Feb 23 23:10:15 UTC 2012


https://bugzilla.redhat.com/show_bug.cgi?id=796783
---
 src/app/controllers/images_controller.rb |    2 +-
 src/lib/image.rb                         |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
index 0c6b350..fb5f5f0 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -50,7 +50,7 @@ class ImagesController < ApplicationController
         type = provider.provider_type
         acct = ProviderAccount.enabled.find_by_provider_name_and_login(provider.name, pimg.provider_account_identifier)
         raise unless acct
-        @account_groups = {type.deltacloud_driver => {:type => type, :accounts => [[acct, at environment.provider_accounts.include?(acct)]]}}
+        @account_groups = {type.deltacloud_driver => {:type => type, :accounts => [{:account => acct,:included => @environment.provider_accounts.include?(acct)}]}}
       rescue Exception => e
         @account_groups = ProviderAccount.enabled.group_by_type(@environment)
       end
diff --git a/src/lib/image.rb b/src/lib/image.rb
index b9ce9b7..9911703 100644
--- a/src/lib/image.rb
+++ b/src/lib/image.rb
@@ -27,8 +27,7 @@ class Image
     xml ||= "<image><name>#{img.name}</name></image>" if img.name.present?
     provider = provider_account.provider
     account_id = provider_account.credentials_hash['username']
-    image = Aeolus::Image.import(provider.name, provider.provider_type.deltacloud_driver, image_id, account_id, xml)
-    image.set_attr("environment", environment.name)
+    image = Aeolus::Image.import(provider.name, provider.provider_type.deltacloud_driver, image_id, account_id, environment.name, xml)
     image
   end
 end
-- 
1.7.6.4




More information about the aeolus-devel mailing list