You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/05/04 00:41:59 UTC
svn commit: r1478996 - in /incubator/ambari/trunk: ./
ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/
ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/
ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/repos/
Author: smohanty
Date: Fri May 3 22:41:58 2013
New Revision: 1478996
URL: http://svn.apache.org/r1478996
Log:
AMBARI-2074. Deployment of HDP 1.2.1 fails on Sles. (smohanty)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml
incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/repos/repoinfo.xml
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1478996&r1=1478995&r2=1478996&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri May 3 22:41:58 2013
@@ -828,6 +828,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2074. Deployment of HDP 1.2.1 fails on Sles. (smohanty)
+
AMBARI-2073. After Ambari upgrade to 1.2.3, MapReduce service check fails
because uid of ambari_qa changed. (swagle)
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb?rev=1478996&r1=1478995&r2=1478996&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb Fri May 3 22:41:58 2013
@@ -94,7 +94,17 @@ export HADOOP_IDENT_STRING=$USER
# export HADOOP_NICENESS=10
# Use libraries from standard classpath
-JAVA_JDBC_LIBS="/usr/share/java/*"
+JAVA_JDBC_LIBS=""
+#Add libraries required by mysql connector
+for jarFile in `ls /usr/share/java/*mysql*`
+do
+ JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
+done
+#Add libraries required by oracle connector
+for jarFile in `ls /usr/share/java/*oracle*`
+do
+ JAVA_JDBC_LIBS=${JAVA_JDBC_LIBS}:$jarFile
+done
#Add libraries required by nodemanager
MAPREDUCE_LIBS=<%=scope.function_hdp_template_var("mapreduce_libs_path")%>
-export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS}
+export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}${JAVA_JDBC_LIBS}:${MAPREDUCE_LIBS}
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml?rev=1478996&r1=1478995&r2=1478996&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDP/1.2.1/repos/repoinfo.xml Fri May 3 22:41:58 2013
@@ -100,24 +100,12 @@
<repoid>HDP-1.2.1</repoid>
<reponame>HDP</reponame>
</repo>
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl>
- <repoid>HDP-UTILS-1.1.0.15</repoid>
- <reponame>HDP-UTILS</reponame>
- <mirrorslist></mirrorslist>
- </repo>
</os>
- <os type="sles11">
+ <os type="sles11">
<repo>
<baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.2.1</baseurl>
<repoid>HDP-1.2.1</repoid>
<reponame>HDP</reponame>
</repo>
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl>
- <repoid>HDP-UTILS-1.1.0.15</repoid>
- <reponame>HDP-UTILS</reponame>
- <mirrorslist></mirrorslist>
- </repo>
</os>
</reposinfo>
Modified: incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/repos/repoinfo.xml
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/repos/repoinfo.xml?rev=1478996&r1=1478995&r2=1478996&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/repos/repoinfo.xml (original)
+++ incubator/ambari/trunk/ambari-server/src/main/resources/stacks/HDPLocal/1.2.1/repos/repoinfo.xml Fri May 3 22:41:58 2013
@@ -100,24 +100,12 @@
<repoid>HDP-1.2.1</repoid>
<reponame>HDP</reponame>
</repo>
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl>
- <repoid>HDP-UTILS-1.1.0.15</repoid>
- <reponame>HDP-UTILS</reponame>
- <mirrorslist></mirrorslist>
- </repo>
</os>
- <os type="sles11">
+ <os type="sles11">
<repo>
<baseurl>http://public-repo-1.hortonworks.com/HDP/suse11/1.x/updates/1.2.1</baseurl>
<repoid>HDP-1.2.1</repoid>
<reponame>HDP</reponame>
</repo>
- <repo>
- <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.15/repos/suse11</baseurl>
- <repoid>HDP-UTILS-1.1.0.15</repoid>
- <reponame>HDP-UTILS</reponame>
- <mirrorslist></mirrorslist>
- </repo>
</os>
</reposinfo>