[PATCH conductor 1/2] Fixed cloud_account to provider_account rename

From: Jan Provaznik <jprovazn(a)redhat.com&gt; --- src/dbomatic/dbomatic | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dbomatic/dbomatic b/src/dbomatic/dbomatic index 3ac7449..406388d 100755 --- a/src/dbomatic/dbomatic +++ b/src/dbomatic/dbomatic @@ -203,18 +203,18 @@ class CondorEventLog < Nokogiri::XML::SAX::Document return end - cloud_account = ProviderAccount.find(:first, :conditions => ['provider_id = ? AND username = ? AND password = ?', provider.id, username, password]) - if cloud_account.nil? + provider_account = ProviderAccount.find(:first, :conditions => ['provider_id = ? AND username = ? AND password = ?', provider.id, username, password]) + if provider_account.nil? @logger.error "Could not find the cloud account corresponding to #{link}, skipping cloud id update" return end - inst.cloud_account_id = cloud_account.id + inst.provider_account_id = provider_account.id # FIXME: we are updating the instance_key_id here, but this is really not # the right way or place to do this. This will have to be revisited when # we come up with a real key management architecture - inst.instance_key_id = cloud_account.instance_key.id + inst.instance_key_id = provider_account.instance_key.id inst.save! end -- 1.7.3.5