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/15 19:14:35 UTC
svn commit: r1457043 - in /incubator/ambari/trunk: CHANGES.txt
ambari-agent/src/main/puppet/modules/hdp-hue/templates/hue-ini.cfg.erb
Author: swagle
Date: Fri Mar 15 18:14:35 2013
New Revision: 1457043
URL: http://svn.apache.org/r1457043
Log:
AMBARI-1648. Hue configuration - DB properties cannot be empty. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
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=1457043&r1=1457042&r2=1457043&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Mar 15 18:14:35 2013
@@ -493,6 +493,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1648. Hue configuration - DB properties cannot be empty. (swagle)
+
AMBARI-1641. Some map and reduce task metrics are missing for the
tasktrackers in the API. (tbeerbower)
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=1457043&r1=1457042&r2=1457043&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 Fri Mar 15 18:14:35 2013
@@ -168,12 +168,14 @@
#
# Note that for sqlite3, 'name', below is a filename;
# for other backends, it is the database name.
+ <% if scope.function_hdp_template_var("::hdp-hue::params::hue_db_engine") != "" %>
engine=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_engine")%>
host=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_port")%>
port=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_host")%>
user=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_user")%>
password=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_password")%>
name=<%=scope.function_hdp_template_var("::hdp-hue::params::hue_db_name")%>
+ <% end %>
# Configuration options for connecting to an external SMTP server