Author: rvs
Date: Tue Mar 20 17:58:22 2012
New Revision: 1303055
URL: http://svn.apache.org/viewvc?rev=1303055&view=rev
Log:
BIGTOP-468. [puppet] Fix httpfs dependencies and give it its own keytab
(Patrick Taylor Ramsey via rvs)
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
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=1303055&r1=1303054&r2=1303055&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:22 2012
@@ -22,7 +22,7 @@ class hadoop {
class kerberos {
require kerberos::client
-
+
kerberos::host_keytab { "hdfs":
princs => [ "host", "hdfs" ],
}
@@ -161,6 +161,11 @@ class hadoop {
$hadoop_httpfs_port = $port
$hadoop_security_authentication = $auth
+ if ($auth == "kerberos") {
+ kerberos::host_keytab { "httpfs":
+ }
+ }
+
package { "hadoop-httpfs":
ensure => latest,
require => Package["jdk"],
@@ -168,17 +173,17 @@ class hadoop {
file { "/etc/hadoop-httpfs/conf/httpfs-site.xml":
content => template('hadoop/httpfs-site.xml'),
- require => [Package["hadoop-hdfs"]],
+ require => [Package["hadoop-httpfs"]],
}
file { "/etc/hadoop-httpfs/conf/httpfs-env.sh":
content => template('hadoop/httpfs-env.sh'),
- require => [Package["hadoop-hdfs"]],
+ require => [Package["hadoop-httpfs"]],
}
file { "/etc/hadoop-httpfs/conf/httpfs-signature.secret":
content => inline_template("<%= secret %>"),
- require => [Package["hadoop-hdfs"]],
+ require => [Package["hadoop-httpfs"]],
}
service { "hadoop-httpfs":
@@ -187,7 +192,7 @@ class hadoop {
subscribe => [Package["hadoop-httpfs"],
File["/etc/hadoop-httpfs/conf/httpfs-site.xml"],
File["/etc/hadoop-httpfs/conf/httpfs-env.sh"],
File["/etc/hadoop-httpfs/conf/httpfs-signature.secret"]],
require => [ Package["hadoop-httpfs"] ],
}
- Kerberos::Host_keytab <| title == "hdfs" |> -> Service["hadoop-httpfs"]
+ Kerberos::Host_keytab <| title == "httpfs" |> -> Service["hadoop-httpfs"]
}
class kinit {
