svn commit: r1482638 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp-sqoop/templates/sqoop-env.sh.erb

[ma...@apache.org]

Author: mahadev
Date: Tue May 14 22:59:15 2013
New Revision: 1482638

URL: http://svn.apache.org/r1482638
Log:
AMBARI-2136. Home paths are not set correctly in /etc/sqoop/conf/sqoop-env.sh (mahadev)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/templates/sqoop-env.sh.erb

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1482638&r1=1482637&r2=1482638&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue May 14 22:59:15 2013
@@ -852,6 +852,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2136. Home paths are not set correctly in /etc/sqoop/conf/sqoop-env.sh
+ (mahadev)
+
  AMBARI-2135. Ambari agent start say to look at .out, not .log. (smohanty)
 
  AMBARI-2134. Set default value of oozie property

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/templates/sqoop-env.sh.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/templates/sqoop-env.sh.erb?rev=1482638&r1=1482637&r2=1482638&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/templates/sqoop-env.sh.erb (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-sqoop/templates/sqoop-env.sh.erb Tue May 14 22:59:15 2013
@@ -20,16 +20,17 @@
 # Set Hadoop-specific environment variables here.
 
 #Set path to where bin/hadoop is available
-export HADOOP_HOME=${HADOOP_HOME:-<%=scope.function_hdp_template_var("::hdp::params::hadoop_home")%>}
+#Set path to where bin/hadoop is available
+export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
 
 #set the path to where bin/hbase is available
-export HBASE_HOME=${HBASE_HOME:-<%=scope.function_hdp_template_var("hbase_home")%>}
+export HBASE_HOME=${HBASE_HOME:-/usr/lib/hbase}
 
 #Set the path to where bin/hive is available
-export HIVE_HOME=${HIVE_HOME:-<%=scope.function_hdp_template_var("hive_home")%>}
+export HIVE_HOME=${HIVE_HOME:-/usr/lib/hive}
+
+#Set the path for where zookeper config dir is
+export ZOOCFGDIR=${ZOOCFGDIR:-/etc/zookeeper/conf}
 
 # add libthrift in hive to sqoop class path first so hive imports work
 export SQOOP_USER_CLASSPATH="`ls ${HIVE_HOME}/lib/libthrift-*.jar 2> /dev/null`:${SQOOP_USER_CLASSPATH}"
-
-#Set the path for where zookeper config dir is
-export ZOOCFGDIR=${ZOOCFGDIR:-<%=scope.function_hdp_template_var("zoo_conf_dir")%>}