You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2011/12/14 08:02:26 UTC
svn commit: r1214069 - in
/incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates:
config_env.erb config_properties.erb
Author: vgogate
Date: Wed Dec 14 07:02:26 2011
New Revision: 1214069
URL: http://svn.apache.org/viewvc?rev=1214069&view=rev
Log:
AMBARI-161. Add puppet module for Hadoop to agent resources
Modified:
incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_env.erb
incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_properties.erb
Modified: incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_env.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_env.erb?rev=1214069&r1=1214068&r2=1214069&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_env.erb (original)
+++ incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_env.erb Wed Dec 14 07:02:26 2011
@@ -18,5 +18,8 @@
<% require 'erubis' -%>
<% conf_category_map.each do |key,value| -%>
-export <%= key %>="<%= Erubis::Eruby.new(value).result(binding) %>"
+ <% while (value.include? '<%=') do -%>
+ <% value=Erubis::Eruby.new(value).result(binding) -%>
+ <% end -%>
+export <%= key %>="<%= value %>"
<% end -%>
Modified: incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_properties.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_properties.erb?rev=1214069&r1=1214068&r2=1214069&view=diff
==============================================================================
--- incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_properties.erb (original)
+++ incubator/ambari/trunk/agent/src/main/resources/puppet/modules/hadoop/templates/config_properties.erb Wed Dec 14 07:02:26 2011
@@ -19,9 +19,12 @@
<configuration>
<% require 'erubis' -%>
<% conf_category_map.each do |key,value| -%>
- <property>
- <name><%= key %></name>
- <value><%= Erubis::Eruby.new(value).result(binding) %></value>
- </property>
+ <property>
+ <name><%= key %></name>
+ <% while (value.include? '<%=') do -%>
+ <% value=Erubis::Eruby.new(value).result(binding) -%>
+ <% end -%>
+ <value><%= value %></value>
+ </property>
<% end -%>
</configuration>