On 09/14/10 - 11:43:18AM, Michal Fojtik wrote: > On 09/09/10 16:52 -0400, Chris Lalancette wrote: > >Recent condor requires a final parameter of "keyname" to > >the the create_instance paramters. Add that in > >condormatic. Note that this requires condor-7.5.4-5dcloud > >or later. > > > >Signed-off-by: Chris Lalancette <[email protected]> > >--- > >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 bee0a52..87503d6 100644 > >--- a/src/app/util/condormatic.rb > >+++ b/src/app/util/condormatic.rb > >@@ -36,8 +36,8 @@ def condormatic_instance_create(task) > > Rails.logger.info "universe = grid\n" > > pipe.puts "executable = #{job_name}\n" > > Rails.logger.info "executable = #{job_name}\n" > >- pipe.puts "grid_resource = dcloud $$(provider_url) $$(username) > >$$(password) $$(image_key) #{instance.name} $$(realm_key) > >$$(hardwareprofile_key)\n" > >- Rails.logger.info "grid_resource = dcloud $$(provider_url) $$(username) > >$$(password) $$(image_key) #{instance.name} $$(realm_key) > >$$(hardwareprofile_key)\n" > > >+ pipe.puts "grid_resource = dcloud $$(provider_url) $$(username) > >$$(password) $$(image_key) #{instance.name} $$(realm_key) > >$$(hardwareprofile_key) NULL\n" > >+ Rails.logger.info "grid_resource = dcloud $$(provider_url) $$(username) > >$$(password) $$(image_key) #{instance.name} $$(realm_key) > >$$(hardwareprofile_key) NULL\n" > > pipe.puts "log = #{job_log}\n" > > Rails.logger.info "log = #{job_log}\n" > > If I correctly understand this patch, the last NULL is a place for key_name > ? If that's right, I'm ACKing this patch.
Yeah, that's right. I should have elaborated a bit more. Once we get the key_name handling plumbed into the aggregator, then we will need to patch this again to properly pass the value that we want to use. For now, this patch just makes it so that the aggregator works with an updated condor. -- Chris Lalancette _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
