You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 02:50:58 UTC
svn commit: r1347231 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/puppet/modules/hdp-templeton/manifests/params.pp
hmc/puppet/modules/hdp-templeton/manifests/server.pp
hmc/puppet/modules/hdp-templeton/templates/templeton-site.xml.erb
Author: vikram
Date: Thu Jun 7 00:50:57 2012
New Revision: 1347231
URL: http://svn.apache.org/viewvc?rev=1347231&view=rev
Log:
AMBARI-428. changes to templeton setup for 0.1.4 (Contributed by Ramya)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/params.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/server.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/templates/templeton-site.xml.erb
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347231&r1=1347230&r2=1347231&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 00:50:57 2012
@@ -6,7 +6,9 @@ characters wide.
Release 0.1.x - unreleased
- AMBARI-435. Oozie start fails with "Not managing symlink mode" (Ramya via Vikram)
+ AMBARI-428. changes to templeton setup for 0.1.4 (Ramya via Vikram)
+
+ AMBARI-425. Oozie start fails with "Not managing symlink mode" (Ramya via Vikram)
AMBARI-424. change "reconfiguremonitoring" message to a better worded action (Hitesh via Vikram)
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/params.pp?rev=1347231&r1=1347230&r2=1347231&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/params.pp Thu Jun 7 00:50:57 2012
@@ -18,14 +18,14 @@ class hdp-templeton::params() inherits h
$templeton_pid_dir = hdp_default("hadoop/templeton-env/templeton_pid_dir","/var/run/templeton")
- $templeton_jar_name= hdp_default("hadoop/templeton-env/templeton_jar_name","templeton-0.1.3.jar")
+ $templeton_jar_name= hdp_default("hadoop/templeton-env/templeton_jar_name","templeton-0.1.4.jar")
$hadoop_prefix = hdp_default("hadoop/templeton-env/hadoop_prefix","/usr")
$hive_prefix = hdp_default("hadoop/templeton-env/hive_prefix","/usr")
### templeton-site
$hadoop_conf_dir = hdp_default("hadoop/templeton-site/hadoop_conf_dir")
- $templeton_jar = hdp_default("hadoop/templeton-site/templeton_jar","/usr/share/templeton/templeton-0.1.3.jar")
+ $templeton_jar = hdp_default("hadoop/templeton-site/templeton_jar","/usr/share/templeton/templeton-0.1.4.jar")
$zookeeper_jar = hdp_default("hadoop/templeton-site/zookeeper_jar","/usr/lib/zookeeper/zookeeper.jar")
$pig_tar_gz = hdp_default("hadoop/templeton-site/pig_tar_gz","$pig_tar_name")
$pig_tar_name_hdfs = hdp_default("hadoop/templeton-site/pig_tar_name_hdfs","pig-0.9.2")
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/server.pp?rev=1347231&r1=1347230&r2=1347231&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/server.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/server.pp Thu Jun 7 00:50:57 2012
@@ -42,6 +42,13 @@ class hdp-templeton::hdfs-directories($s
mode => '755',
recursive_chmod => true
}
+
+ hdp-hadoop::hdfs::directory{ '/apps/templeton':
+ service_state => $service_state,
+ owner => $templeton_user,
+ mode => '755',
+ recursive_chmod => true
+ }
}
@@ -49,31 +56,31 @@ class hdp-templeton::copy-hdfs-directori
{
$templeton_user = $hdp-templeton::params::templeton_user
$pig_src_tar = "$hdp::params::artifact_dir/pig.tar.gz"
- #TODO: need to make sure that hdfs service is running
+
hdp-hadoop::hdfs::copyfromlocal { '/usr/share/templeton/templeton*jar':
service_state => $service_state,
owner => $hdp-templeton::params::templeton_user,
mode => '755',
- dest_dir => '/user/templeton/ugi.jar'
+ dest_dir => '/apps/templeton/ugi.jar'
}
hdp-hadoop::hdfs::copyfromlocal { '/usr/lib/hadoop/contrib/streaming/hadoop-streaming*.jar':
service_state => $service_state,
owner => $hdp-templeton::params::templeton_user,
mode => '755',
- dest_dir => '/user/templeton/hadoop-streaming.jar'
+ dest_dir => '/apps/templeton/hadoop-streaming.jar'
}
#TODO: Use ${hdp::params::artifact_dir}/${hdp-templeton::params::pig_tar_name} instead
hdp-hadoop::hdfs::copyfromlocal { '/tmp/HDP-artifacts/pig.tar.gz' :
service_state => $service_state,
owner => $hdp-templeton::params::templeton_user,
mode => '755',
- dest_dir => '/user/templeton/pig.tar.gz'
+ dest_dir => '/apps/templeton/pig.tar.gz'
}
#TODO: Use ${hdp::params::artifact_dir}/${hdp-templeton::params::hive_tar_name} instead
hdp-hadoop::hdfs::copyfromlocal { '/tmp/HDP-artifacts/hive.tar.gz' :
service_state => $service_state,
owner => $hdp-templeton::params::templeton_user,
mode => '755',
- dest_dir => '/user/templeton/hive.tar.gz'
+ dest_dir => '/apps/templeton/hive.tar.gz'
}
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/templates/templeton-site.xml.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/templates/templeton-site.xml.erb?rev=1347231&r1=1347230&r2=1347231&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/templates/templeton-site.xml.erb (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/templates/templeton-site.xml.erb Thu Jun 7 00:50:57 2012
@@ -57,7 +57,7 @@ limitations under the License.
<property>
<name>templeton.pig.archive</name>
- <value>hdfs:///user/templeton/<%=scope.function_hdp_template_var("pig_tar_gz")%></value>
+ <value>hdfs:///apps/templeton/<%=scope.function_hdp_template_var("pig_tar_gz")%></value>
<description>The path to the Pig archive.</description>
</property>
@@ -75,7 +75,7 @@ limitations under the License.
<property>
<name>templeton.hive.archive</name>
- <value>hdfs:///user/templeton/<%=scope.function_hdp_template_var("hive_tar_gz")%></value>
+ <value>hdfs:///apps/templeton/<%=scope.function_hdp_template_var("hive_tar_gz")%></value>
<description>The path to the Hive archive.</description>
</property>
@@ -105,4 +105,18 @@ limitations under the License.
<description>The class to use as storage</description>
</property>
+ <property>
+ <name>templeton.override.enabled</name>
+ <value>false</value>
+ <description>
+ Enable the override path in templeton.override.jars
+ </description>
+ </property>
+
+ <property>
+ <name>templeton.streaming.jar</name>
+ <value>hdfs:///apps/templeton/hadoop-streaming.jar</value>
+ <description>The hdfs path to the Hadoop streaming jar file.</description>
+ </property>
+
</configuration>