AMBARI-212. Fix templeton configurations. (ramya via omalley)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1337218 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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

hmc/puppet/modules/hdp-templeton/manifests/params.pp

@@ -8,7 +8,7 @@ class hdp-templeton::params() inherits hdp::params
   $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 hdp::params
   ### 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")

hmc/puppet/modules/hdp-templeton/manifests/server.pp

@@ -39,7 +39,7 @@ class hdp-templeton::hdfs-directories($service_state)
   hdp-hadoop::hdfs::directory{ '/user/templeton':
     service_state => $service_state,
     owner => $templeton_user,
-    mode  => '770',
+    mode  => '755',
     recursive_chmod => true
   }  
 }

hmc/puppet/modules/hdp-templeton/templates/templeton-site.xml.erb

@@ -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>
 

hmc/puppet/modules/hdp/manifests/params.pp

@@ -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