incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r1337218 - in /incubator/ambari/branches/ambari-186: ./ hmc/puppet/modules/hdp-templeton/manifests/ hmc/puppet/modules/hdp-templeton/templates/ hmc/puppet/modules/hdp/manifests/
Date Fri, 11 May 2012 15:47:30 GMT
Author: omalley
Date: Fri May 11 15:47:29 2012
New Revision: 1337218

URL: http://svn.apache.org/viewvc?rev=1337218&view=rev
Log:
AMBARI-212. Fix templeton configurations. (ramya via omalley)

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
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1337218&r1=1337217&r2=1337218&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri May 11 15:47:29 2012
@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-212. Fix templeton configurations. (ramya via omalley)
+
   AMBARI-206. Fix undefined variable in orchestrator. (hitesh via omalley)
 
   AMBARI-208. Support filtering hosts based on discovery status. (hitesh

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=1337218&r1=1337217&r2=1337218&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
Fri May 11 15:47:29 2012
@@ -8,7 +8,7 @@ class hdp-templeton::params() inherits h
   $pig_tar_url = "${download_url}/pig-0.9.2.tar.gz"
   $pig_tar_name = hdp_default("pig_tar_name","pig.tar.gz")
   $hive_tar_url = "${download_url}/hive-0.8.1.tar.gz"
-  $hive_tar_name = hdp_default("hive_tar_name","hive.tar.gz")
+  $hive_tar_name = hdp_default("hive_tar_name","hive-0.8.1")
 
   ### templeton-env
   $conf_dir = hdp_default("hadoop/templeton-env/conf_dir","/etc/templeton")
@@ -26,11 +26,11 @@ class hdp-templeton::params() inherits h
   ### 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")
-  $zookeeper_jar = hdp_default("hadoop/templeton-site/zookeeper_jar","/usr/share/zookeeper/zookeeper-*.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")
 
-  $hive_tar_gz = hdp_default("hadoop/templeton-site/hive_tar_gz","$hive_tar_name")
+  $hive_tar_gz = hdp_default("hadoop/templeton-site/hive_tar_gz","hive.tar.gz")
   $hive_metastore_sasl_enabled = hdp_default("hadoop/templeton-site/hive_metastore_sasl_enabled","no")
 
   $templeton_metastore_principal = hdp_default("hadoop/templeton-site/templeton_metastore_principal")

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=1337218&r1=1337217&r2=1337218&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
Fri May 11 15:47:29 2012
@@ -39,7 +39,7 @@ class hdp-templeton::hdfs-directories($s
   hdp-hadoop::hdfs::directory{ '/user/templeton':
     service_state => $service_state,
     owner => $templeton_user,
-    mode  => '770',
+    mode  => '755',
     recursive_chmod => true
   }  
 }

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=1337218&r1=1337217&r2=1337218&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
Fri May 11 15:47:29 2012
@@ -32,7 +32,7 @@ limitations under the License.
 
   <property>
     <name>templeton.hadoop.conf.dir</name>
-    <value><%=scope.function_hdp_template_var("::hdp::params::hadoop_home")%></value>
+    <value><%=scope.function_hdp_template_var("::hdp::params::hadoop_conf_dir")%></value>
     <description>The path to the Hadoop configuration.</description>
   </property>
 

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp?rev=1337218&r1=1337217&r2=1337218&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp Fri May
11 15:47:29 2012
@@ -117,7 +117,7 @@ notice("$public_namenode_host")
 
   $lzo_tar_name = hdp_default("lzo_tar_name","hadoop-lzo-0.5.0")
   
-  $snappy_so = hdp_default("snappy_so","libsnappy.so.1.1.3")
+  $snappy_so = hdp_default("snappy_so","libsnappy.so")
   #####
  
   #because of Puppet user resource issue make sure that $hadoop_user is different from hadoop_user_group



Mime
View raw message