You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/04/12 02:57:32 UTC

svn commit: r1467156 - in /incubator/ambari/trunk: ./ ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/ ambari-agent/src/main/puppet/modules/hdp-hbase/templates/

Author: jaimin
Date: Fri Apr 12 00:57:31 2013
New Revision: 1467156

URL: http://svn.apache.org/r1467156
Log:
AMBARI-1902. RegionServer does not start in secure cluster. (jaimin)

Added:
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb
      - copied unchanged from r1467155, incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_region_server_jaas.conf.erb
Removed:
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_region_server_jaas.conf.erb
Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467156&r1=1467155&r2=1467156&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 12 00:57:31 2013
@@ -695,6 +695,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1902: RegionServer does not start in secure cluster. (jaimin)
+
  AMBARI-1903. Host Exception Popup layout and cosmetic issues. (srimanth)
 
  AMBARI-1901. Add additional tests for verifying request behavior based on 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp?rev=1467156&r1=1467155&r2=1467156&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/init.pp Fri Apr 12 00:57:31 2013
@@ -101,7 +101,7 @@ class hdp-hbase(
       if ($type == 'master') {
         hdp-hbase::configfile { 'hbase_master_jaas.conf' : }
       } elsif ($type == 'regionserver') {
-        hdp-hbase::configfile { 'hbase_region_server_jaas.conf' : }
+        hdp-hbase::configfile { 'hbase_regionserver_jaas.conf' : }
       } else {
         hdp-hbase::configfile { 'hbase_client_jaas.conf' : }
       }

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb?rev=1467156&r1=1467155&r2=1467156&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb Fri Apr 12 00:57:31 2013
@@ -79,6 +79,5 @@ export HBASE_MANAGES_ZK=false
 <% if scope.function_hdp_template_var("security_enabled") == true %>
 export HBASE_OPTS="$HBASE_OPTS -Djava.security.auth.login.config=<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_client_jaas_config_file")%>"
 export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Djava.security.auth.login.config=<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_master_jaas_config_file")%>"
-export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Djava.security.auth
-.login.config=<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_regionserver_jaas_config_file")%>"
+export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config=<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_regionserver_jaas_config_file")%>"
 <% end %>