Author: swagle
Date: Tue Mar 26 20:29:43 2013
New Revision: 1461299
URL: http://svn.apache.org/r1461299
Log:
AMBARI-1711. Trunk is broken due to invalid argument to a puppet custom
function hdp_default.. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1461299&r1=1461298&r2=1461299&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Mar 26 20:29:43 2013
@@ -527,6 +527,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1711. Trunk is broken due to invalid argument to a puppet custom
+ function hdp_default. (swagle)
+
AMBARI-1706. Security wizard: "Done" and "back" buttons on Apply step
should be disabled while step is in progress. (jaimin)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp?rev=1461299&r1=1461298&r2=1461299&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
Tue Mar 26 20:29:43 2013
@@ -83,9 +83,9 @@ class hdp-hbase::params() inherits hdp::
$regionserver_memstore_upperlimit =
hdp_default("hadoop/hbase-site/regionserver_memstore_upperlimit","0.4")
- $hbase_client_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_client_jaas_config_file",
${conf_dir}/hbase_client_jaas.conf)
- $hbase_master_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_master_jaas_config_file",
${conf_dir}/hbase_master_jaas.conf)
- $hbase_regionserver_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_regionserver_jaas_config_file",
${conf_dir}/hbase_regionserver_jaas.conf)
+ $hbase_client_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_client_jaas_config_file",
"${conf_dir}/hbase_client_jaas.conf")
+ $hbase_master_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_master_jaas_config_file",
"${conf_dir}/hbase_master_jaas.conf")
+ $hbase_regionserver_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_regionserver_jaas_config_file",
"${conf_dir}/hbase_regionserver_jaas.conf")
$hbase_master_keytab_path =
hdp_default("hadoop/hbase-site/hbase_master_keytab_file",
"${keytab_path}/hbase_service_keytab")
$hbase_master_principal =
hdp_default("hadoop/hbase-site/hbase_master_kerberos_principal",
"hbase/_HOST@${kerberos_domain}")
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp?rev=1461299&r1=1461298&r2=1461299&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/init.pp
Tue Mar 26 20:29:43 2013
@@ -33,6 +33,40 @@ class hdp(
ensure => present
}
+
+ ## Port settings
+ if has_key($configuration, 'hdfs-site') {
+ $hdfs-site = $configuration['hdfs-site']
+ $namenode_port = hdp_get_port_from_url($hdfs-site["dfs.http.address"])
+ $snamenode_port =
hdp_get_port_from_url($hdfs-site["dfs.secondary.http.address"])
+ $datanode_port =
hdp_get_port_from_url($hdfs-site["dfs.datanode.http.address"])
+ } else {
+ $namenode_port = "50070"
+ $snamenode_port = "50090"
+ $datanode_port = "50075"
+ }
+
+ if has_key($configuration, 'mapred-site') {
+ $mapred-site = $configuration['mapred-site']
+ $jtnode_port =
hdp_get_port_from_url($mapred-site["mapred.job.tracker.http.address"])
+ $tasktracker_port =
hdp_get_port_from_url($mapred-site["mapred.task.tracker.http.address"])
+ $jobhistory_port =
hdp_get_port_from_url($mapred-site["mapreduce.history.server.http.address"])
+ } else {
+ $jtnode_port = "50030"
+ $tasktracker_port = "50060"
+ $jobhistory_port = "51111"
+ }
+
+ if has_key($configuration, 'hbase-site') {
+ $hbase-site = $configuration['hbase-site']
+ $hbase_master_port = $hbase-site["hbase.master.info.port"]
+ $hbase_rs_port = $hbase-site["hbase.regionserver.info.port"]
+ } else {
+ $hbase_master_port = "60010"
+ $hbase_rs_port = "60030"
+ }
+
+
#TODO: think not needed and also there seems to be a puppet bug around this
and ldap
hdp::user { $hdp::params::hadoop_user:
gid => $hdp::params::user_group
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1461299&r1=1461298&r2=1461299&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
Tue Mar 26 20:29:43 2013
@@ -47,38 +47,6 @@ class hdp::params()
$hbase_master_hosts = hdp_default("hbase_master_hosts", "")
$hbase_rs_hosts = hdp_default("hbase_rs_hosts",$slave_hosts) #if
hbase_rs_hosts not given it is assumed that region servers on same nodes as
slaves
- ## Port settings
- if has_key($configuration, 'hdfs-site') {
- $hdfs-site = $configuration['hdfs-site']
- $namenode_port = hdp_get_port_from_url($hdfs-site["dfs.http.address"])
- $snamenode_port =
hdp_get_port_from_url($hdfs-site["dfs.secondary.http.address"])
- $datanode_port =
hdp_get_port_from_url($hdfs-site["dfs.datanode.http.address"])
- } else {
- $namenode_port = "50070"
- $snamenode_port = "50090"
- $datanode_port = "50075"
- }
-
- if has_key($configuration, 'mapred-site') {
- $mapred-site = $configuration['mapred-site']
- $jtnode_port =
hdp_get_port_from_url($mapred-site["mapred.job.tracker.http.address"])
- $tasktracker_port =
hdp_get_port_from_url($mapred-site["mapred.task.tracker.http.address"])
- $jobhistory_port =
hdp_get_port_from_url($mapred-site["mapreduce.history.server.http.address"])
- } else {
- $jtnode_port = "50030"
- $tasktracker_port = "50060"
- $jobhistory_port = "51111"
- }
-
- if has_key($configuration, 'hbase-site') {
- $hbase-site = $configuration['hbase-site']
- $hbase_master_port = $hbase-site["hbase.master.info.port"]
- $hbase_rs_port = $hbase-site["hbase.regionserver.info.port"]
- } else {
- $hbase_master_port = "60010"
- $hbase_rs_port = "60030"
- }
-
$hive_server_host = hdp_default("hive_server_host", "")
$oozie_server = hdp_default("oozie_server", "")
$webhcat_server_host = hdp_default("webhcat_server_host", "")
