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 2012/03/24 02:25:26 UTC

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

Author: rvs
Date: Sat Mar 24 01:25:26 2012
New Revision: 1304698

URL: http://svn.apache.org/viewvc?rev=1304698&view=rev
Log:
BIGTOP-487. oozie security configuration needs to be updated

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

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp?rev=1304698&r1=1304697&r2=1304698&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/manifests/init.pp Sat Mar 24 01:25:26 2012
@@ -32,7 +32,7 @@ class hadoop-oozie {
       ensure => latest,
     }
 
-    file { "/etc/oozie/oozie-site.xml":
+    file { "/etc/oozie/conf/oozie-site.xml":
       content => template("hadoop-oozie/oozie-site.xml"),
       require => Package["oozie"],
     }

Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml?rev=1304698&r1=1304697&r2=1304698&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop-oozie/templates/oozie-site.xml Sat Mar 24 01:25:26 2012
@@ -230,7 +230,7 @@
 
     <property>
         <name>oozie.authentication.type</name>
-        <value>simple</value>
+        <value><%= kerberos_realm.empty? ? "simple" : "kerberos" %></value>
         <description>
             Defines authentication used for Oozie HTTP endpoint.
             Supported values are: simple | kerberos | #AUTHENTICATION_HANDLER_CLASSNAME#