svn commit: r1151622 - in /incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor: condor_client.rb ip_agents/confserver.rb

[mf...@apache.org]

Author: mfojtik
Date: Wed Jul 27 20:49:57 2011
New Revision: 1151622

URL: http://svn.apache.org/viewvc?rev=1151622&view=rev
Log:
A few fixes for condor cloud

This patch fixes two major issues.  The confserver code doesn't
interpret as is.  Also daemon runs as 'nobody' so we don't need the
'su'.

Signed-off-by: Ian Main <im...@redhat.com>

Modified:
    incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/condor_client.rb
    incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/ip_agents/confserver.rb

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/condor_client.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/condor_client.rb?rev=1151622&r1=1151621&r2=1151622&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/condor_client.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/condor_client.rb Wed Jul 27 20:49:57 2011
@@ -38,10 +38,7 @@ module CondorCloud
 
     CONDOR_Q_CMD = ENV['CONDOR_Q_CMD'] || "condor_q"
     CONDOR_RM_CMD = ENV['CONDOR_RM_CMD'] || "condor_rm"
-
-    # deltacloudd runs as root from the init script so we have to use su to move to
-    # 'condor' user.
-    CONDOR_SUBMIT_CMD = ENV['CONDOR_SUBMIT_CMD'] || 'su condor -m -c condor_submit'
+    CONDOR_SUBMIT_CMD = ENV['CONDOR_SUBMIT_CMD'] || 'condor_submit'
 
     # This directory needs to be readable for user running Deltacloud API
     CONDOR_CONFIG = ENV['CONDOR_CONFIG'] || 'config/condor.yaml'

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/ip_agents/confserver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/ip_agents/confserver.rb?rev=1151622&r1=1151621&r2=1151622&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/ip_agents/confserver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/condor/ip_agents/confserver.rb Wed Jul 27 20:49:57 2011
@@ -47,11 +47,10 @@ module CondorCloud
     def find_free_mac
       addr_hash = {}
       DefaultExecutor::new do |executor|
-        CondorAddresses = (@mappings/'/CondorAddresses/CondorAddress').collect { |a| CondorAddress.new(:ip => a.text.strip, :mac => a[:mac]) }
 
         # Make an CondorAddress hash to speed up the inner loop.
-        CondorAddresses.each do |CondorAddress|
-          addr_hash[CondorAddress.mac] = CondorAddress.ip
+        CondorAddresses.each do |address|
+          addr_hash[address.mac] = address.ip
         end
 
         executor.instances.each do |instance|