- Fixes for Rhea spark module

spark_setup.py

@@ -67,6 +67,7 @@ def generateScript():
 
     outf.write( 'source ${MODULESHOME}/init/bash\n' )
     outf.write( 'module load python\n' )
+    outf.write( 'module load spark_on_demand/1.0.0\n' )
     outf.write( 'export PYTHONPATH=$SPARK_HOME/python:$PYTHONPATH\n\n' )
 
     outf.write( 'if [ -d "$SPARK_DEPLOY_DIR/nodes" ]; then\n' )
@@ -76,7 +77,7 @@ def generateScript():
 
     outf.write( "echo =============== Running spark deployment ===============\n\n" )
 
-    outf.write( 'mpirun -n ' + num_nodes + ' --npernode 1 $SPARK_HOME/sbin/spark_deploy.py $SPARK_HOME $SPARK_DEPLOY_DIR &\n\n' )
+    outf.write( 'mpirun -n ' + num_nodes + ' --npernode 1 $SPARK_ON_DEMAND_HOME/spark_deploy.py $SPARK_HOME $SPARK_DEPLOY_DIR &\n\n' )
     outf.write( "MASTERFILE=$SPARK_DEPLOY_DIR/nodes/master\n" )
     outf.write( "timeout=" + deploy_timeout + "\n" )
     outf.write( "while [ ! -f $MASTERFILE ]\n" )