On Wed, 2011-07-27 at 04:35 -0400, Chris Lalancette wrote:
From: Jan Provaznik <jprovazn(a)redhat.com>
No need to create bucket in iwhd anymore,
Hmm, this is code to create an S3 bucket, not an IWHD bucket
You probably just mis-typed, though, since you're the one that added
this code originally:
http://git.fedorahosted.org/git/?p=aeolus/conductor.git;a=commitdiff;h=cb...
no need to create ssh key for provider account (ssh key is generated
per instance)
---
src/app/models/provider_account_observer.rb | 34 ---------------------
src/config/environment.rb | 2 +-
src/spec/models/provider_account_observer_spec.rb | 23 --------------
3 files changed, 1 insertions(+), 58 deletions(-)
delete mode 100644 src/app/models/provider_account_observer.rb
delete mode 100644 src/spec/models/provider_account_observer_spec.rb
diff --git a/src/app/models/provider_account_observer.rb
b/src/app/models/provider_account_observer.rb
deleted file mode 100644
index fd5b65a..0000000
--- a/src/app/models/provider_account_observer.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-class ProviderAccountObserver < ActiveRecord::Observer
- def after_create(account)
- # FIXME: new boxgrinder doesn't create bucket for amis automatically,
- # for now we create bucket from conductor
- # remove this hotfix when fixed on boxgrinder side
- if account.provider.provider_type_id ==
ProviderType.find_by_codename("ec2").id
- create_bucket(account)
- end
- if key = account.generate_auth_key
- account.update_attribute(:instance_key, InstanceKey.create!(:pem =>
key.pem.first, :name => key.id, :instance_key_owner => account))
- end
- account.populate_hardware_profiles
It looks like it's not correct to remove this populate_hardware_profiles
call.
I think you should remove the instance key stuff in the previous patch
and make this patch just about removing the bucket creation
Cheers,
Mark.