svn commit: r1303054 - in /incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop: manifests/init.pp templates/mapred-site.xml

[rv...@apache.org]

Author: rvs
Date: Tue Mar 20 17:58:16 2012
New Revision: 1303054

URL: http://svn.apache.org/viewvc?rev=1303054&view=rev
Log:
BIGTOP-467. [puppet] yarn historyserver currently doesn't depend on the mapreduce keytab as it should (Patrick Taylor Ramsey via rvs)

Modified:
    incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
    incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1303054&r1=1303053&r2=1303054&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp Tue Mar 20 17:58:16 2012
@@ -27,7 +27,8 @@ class hadoop {
       princs => [ "host", "hdfs" ],
     }
    
-    kerberos::host_keytab { [ "yarn", "mapred" ]:
+    kerberos::host_keytab { [ "yarn", "mapreduce" ]:
+      tag    => "mapreduce",
     }
   }
 
@@ -297,7 +298,7 @@ class hadoop {
                     File["/etc/hadoop/conf/yarn-site.xml"], File["/etc/hadoop/conf/core-site.xml"]],
       require => [ Package["hadoop-yarn-resourcemanager"] ],
     }
-    Kerberos::Host_keytab <| title == "yarn" |> -> Service["hadoop-yarn-resourcemanager"]
+    Kerberos::Host_keytab <| tag == "mapreduce" |> -> Service["hadoop-yarn-resourcemanager"]
   }
 
   define proxyserver ($host = $fqdn, $port = "8088", $auth = "simple") {
@@ -319,7 +320,7 @@ class hadoop {
                     File["/etc/hadoop/conf/yarn-site.xml"], File["/etc/hadoop/conf/core-site.xml"]],
       require => [ Package["hadoop-yarn-proxyserver"] ],
     }
-    Kerberos::Host_keytab <| title == "yarn" |> -> Service["hadoop-yarn-proxyserver"]
+    Kerberos::Host_keytab <| tag == "mapreduce" |> -> Service["hadoop-yarn-proxyserver"]
   }
 
   define historyserver ($host = $fqdn, $port = "10020", $webapp_port = "19888", $auth = "simple") {
@@ -342,7 +343,7 @@ class hadoop {
                     File["/etc/hadoop/conf/yarn-site.xml"], File["/etc/hadoop/conf/core-site.xml"]],
       require => [Package["hadoop-mapreduce-historyserver"]],
     }
-    Kerberos::Host_keytab <| title == "yarn" |> -> Service["hadoop-mapreduce-historyserver"]
+    Kerberos::Host_keytab <| tag == "mapreduce" |> -> Service["hadoop-mapreduce-historyserver"]
   }
 
 
@@ -365,7 +366,7 @@ class hadoop {
                     File["/etc/hadoop/conf/yarn-site.xml"], File["/etc/hadoop/conf/core-site.xml"]],
       require => [ Package["hadoop-yarn-nodemanager"], File[$dirs] ],
     }
-    Kerberos::Host_keytab <| title == "yarn" |> -> Service["hadoop-yarn-nodemanager"]
+    Kerberos::Host_keytab <| tag == "mapreduce" |> -> Service["hadoop-yarn-nodemanager"]
 
     file { $dirs:
       ensure => directory,

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml?rev=1303054&r1=1303053&r2=1303054&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml Tue Mar 20 17:58:16 2012
@@ -22,11 +22,11 @@
   <!-- HistoryServer security configs -->
   <property>
     <name>mapreduce.jobhistory.principal</name>
-    <value>yarn/_HOST@<%= kerberos_realm %></value>
+    <value>mapreduce/_HOST@<%= kerberos_realm %></value>
   </property>
   <property>
     <name>mapreduce.jobhistory.keytab</name>
-    <value>/etc/yarn.keytab</value> <!-- path to the MapReduce keytab -->
+    <value>/etc/mapreduce.keytab</value> <!-- path to the MapReduce keytab -->
   </property>
 
   <!-- JobTracker security configs -->