All,
Just as an FYI, I pushed the following two trivial commits to the next
branch of the aggregator.
--
Chris Lalancette
commit 6d81adfca836906c747bbe400830c2db5036aac2
Author: Chris Lalancette <[email protected]>
Date: Thu Dec 16 10:21:14 2010 -0500
Make the RPM require rackful_submit.
Commit d08a888e2cc2812c29501976f5eda71ad2cfd486 brought
in the requirement for rackful_submit, so make sure the
RPM depends on it too.
Signed-off-by: Chris Lalancette <[email protected]>
diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in
index d82b699..ce76f4e 100644
--- a/deltacloud-aggregator.spec.in
+++ b/deltacloud-aggregator.spec.in
@@ -31,6 +31,7 @@ Requires: rubygem(builder)
Requires: rubygem(json)
Requires: rubygem(deltacloud-image-builder-agent)
Requires: rubygem(imagebuilder-console)
+Requires: rubygem(rack-restful_submit)
Requires: postgresql
Requires: postgresql-server
Requires: ruby-postgres
commit a727489dc2bd9a6b15d16a92db7891f775a85b89
Author: Chris Lalancette <[email protected]>
Date: Thu Dec 16 10:12:07 2010 -0500
New condor jobs required a "NULL" userdata parameter.
Signed-off-by: Chris Lalancette <[email protected]>
diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in
index 841d135..d82b699 100644
--- a/deltacloud-aggregator.spec.in
+++ b/deltacloud-aggregator.spec.in
@@ -36,7 +36,7 @@ Requires: postgresql-server
Requires: ruby-postgres
Requires: ruby-RMagick
Requires: classads >= 1.0
-Requires: condor >= 7.5.4
+Requires: condor >= 7.5.5-10dcloud
Requires: iwhd
BuildRequires: ruby-devel
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 37040cd..79021ba 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -50,7 +50,7 @@ def condormatic_instance_create(task)
else
resource += " NULL"
end
- resource += " $$(hardwareprofile_key) $$(keypair)\n"
+ resource += " $$(hardwareprofile_key) $$(keypair) NULL\n"
pipe.puts resource
Rails.logger.info resource
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
