You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/02/10 07:04:01 UTC
[35/50] [abbrv] git commit: BIGTOP-806. now that MAPREDUCE-3916 is
fixed we should enable webproxy
BIGTOP-806. now that MAPREDUCE-3916 is fixed we should enable webproxy
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/6762dcde
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/6762dcde
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/6762dcde
Branch: refs/heads/RCs
Commit: 6762dcdea0a349a6cb31e40da84eaf5d7a35917a
Parents: 9c83eb0
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Fri Dec 7 12:04:14 2012 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Fri Dec 7 12:04:14 2012 -0800
----------------------------------------------------------------------
bigtop-deploy/puppet/manifests/cluster.pp | 11 ++++++++++-
.../puppet/modules/hadoop/manifests/init.pp | 2 +-
.../puppet/modules/hadoop/templates/yarn-site.xml | 13 -------------
3 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6762dcde/bigtop-deploy/puppet/manifests/cluster.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp
index 99d5af3..6675863 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -43,7 +43,7 @@ class hadoop_cluster_node {
$hadoop_rm_host = $hadoop_head_node
$hadoop_rt_port = extlookup("hadoop_rt_port", "8025")
- $hadoop_rm_port = extlookup("hadoop_rm_port", "8040")
+ $hadoop_rm_port = extlookup("hadoop_rm_port", "8032")
$hadoop_sc_port = extlookup("hadoop_sc_port", "8030")
$hadoop_rt_thrift_port = extlookup("hadoop_rt_thrift_port", "9290")
@@ -51,6 +51,9 @@ class hadoop_cluster_node {
$hadoop_hs_port = extlookup("hadoop_hs_port", "10020")
$hadoop_hs_webapp_port = extlookup("hadoop_hs_webapp_port", "19888")
+ $hadoop_ps_host = $hadoop_head_node
+ $hadoop_ps_port = extlookup("hadoop_ps_port", "20888")
+
$hadoop_jobtracker_host = $hadoop_head_node
$hadoop_jobtracker_port = extlookup("hadoop_jobtracker_port", "8021")
$hadoop_jobtracker_thrift_port = extlookup("hadoop_jobtracker_thrift_port", "9290")
@@ -184,6 +187,12 @@ class hadoop_head_node inherits hadoop_cluster_node {
auth => $hadoop_security_authentication,
}
+ hadoop::proxyserver { "proxyserver":
+ host => $hadoop_ps_host,
+ port => $hadoop_ps_port,
+ auth => $hadoop_security_authentication,
+ }
+
hadoop::httpfs { "httpfs":
namenode_host => $hadoop_namenode_host,
namenode_port => $hadoop_namenode_port,
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6762dcde/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
index 496c303..0b92f56 100644
--- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
@@ -436,7 +436,7 @@ class hadoop {
}
- define resourcemanager ($host = $fqdn, $port = "8040", $rt_port = "8025", $sc_port = "8030", $thrift_port = "9290", $auth = "simple") {
+ define resourcemanager ($host = $fqdn, $port = "8032", $rt_port = "8025", $sc_port = "8030", $thrift_port = "9290", $auth = "simple") {
$hadoop_rm_host = $host
$hadoop_rm_port = $port
$hadoop_rt_port = $rt_port
http://git-wip-us.apache.org/repos/asf/bigtop/blob/6762dcde/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
index 07ead0c..76eb8e9 100644
--- a/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
@@ -54,25 +54,12 @@
<name>yarn.nodemanager.linux-container-executor.group</name>
<value>hadoop</value>
</property>
-
- <property>
- <name>yarn.web-proxy.principal</name>
- <value>yarn/_HOST@<%= kerberos_realm %></value>
- </property>
- <property>
- <name>yarn.web-proxy.keytab</name>
- <value>/etc/yarn.keytab</value>
- </property>
<% end %>
-<%
-=begin FIXME: MAPREDUCE-3916 -%>
<property>
<name>yarn.web-proxy.address</name>
<value><%= hadoop_ps_host %>:<%= hadoop_ps_port %></value>
</property>
-<%
-=end -%>
<property>
<name>yarn.resourcemanager.resource-tracker.address</name>