On Thu, 2011-02-10 at 19:44 -0800, Ian Main wrote:
This patch just renames the classad variables to keep things more
consistent. No real functional change here.
Signed-off-by: Ian Main <imain(a)redhat.com>
---
src/app/util/condormatic.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 23aafef..613430b 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -67,7 +67,7 @@ def condormatic_instance_create(task)
# Call into the deltacloud quota plugin. This uses a REST API to call back into
the
# conductor to check quotas as the last thing in the logical AND to match a
provider
# account.
- requirements += " && deltacloud_quota_check(#{instance.id},
other.cloud_account_id)"
+ requirements += " && deltacloud_quota_check(#{instance.id},
other.provider_account_id)"
requirements += "\n"
pipe.puts requirements
@@ -249,7 +249,7 @@ def condormatic_classads_sync
pipe.puts "provider_url=\"#{account.provider.url}\""
pipe.puts "username=\"#{account.username}\""
pipe.puts "password=\"#{account.password}\""
- pipe.puts "cloud_account_id=\"#{account.id}\""
+ pipe.puts "provider_account_id=\"#{account.id}\""
pipe.puts "keypair=\"#{escape(account.instance_key.name)}\""
pipe.close_write
ACK