You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/03/25 18:34:34 UTC
svn commit: r1460774 - in /incubator/ambari/trunk: CHANGES.txt
ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
Author: swagle
Date: Mon Mar 25 17:34:34 2013
New Revision: 1460774
URL: http://svn.apache.org/r1460774
Log:
AMBARI-1673. Configuring Hue to work with a secure HDP cluster and making changes to the Enable Security feature. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1460774&r1=1460773&r2=1460774&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Mar 25 17:34:34 2013
@@ -12,6 +12,9 @@ Trunk (unreleased changes):
NEW FEATURES
+ AMBARI-1673. Configuring Hue to work with a secure HDP cluster and making changes
+ to the Enable Security feature. (swagle)
+
AMBARI-1663. Allow adding host components to existing hosts. (Xi Wang via
yusaku)
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp?rev=1460774&r1=1460773&r2=1460774&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/manifests/params.pp Mon Mar 25 17:34:34 2013
@@ -95,6 +95,11 @@ class hdp-hue::params() inherits hdp::pa
$hue_whitelist = $hue-site["whitelist"]
+ # Security Configuration properties
+
+ $hue_keytab_path = $hue-site["hue_keytab"]
+ $hue_principal = $hue-site["hue_principal"]
+
} else {
##TODO: Temporary intialization
# Hue Configuration properties
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb?rev=1460774&r1=1460773&r2=1460774&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb Mon Mar 25 17:34:34 2013
@@ -199,13 +199,14 @@
# ------------------------------------------------------------------------
[[kerberos]]
+ <% if scope.function_hdp_template_var("::hdp::params::security_enabled") == true %>
# Path to Hue's Kerberos keytab file
- ## hue_keytab=
+ hue_keytab=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_keytab_path")%>
# Kerberos principal name for Hue
- ## hue_principal=hue/hostname.foo.com
+ hue_principal=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_principal")%>
# Path to kinit
- ## kinit_path=/path/to/kinit
-
+ kinit_path=<%=scope.function_hdp_template_var("::hdp::params::kinit_path_local")%>
+ <% end %>
###########################################################################
# Settings to configure your Hadoop cluster.