Author: rvs
Date: Wed Mar 28 17:04:03 2012
New Revision: 1306467
URL: http://svn.apache.org/viewvc?rev=1306467&view=rev
Log:
BIGTOP-493. [puppet] core-site.xml and httpfs-site.xml end up changing every
few times puppet is run (Patrick Taylor Ramsey via rvs)
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml?rev=1306467&r1=1306466&r2=1306467&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
Wed Mar 28 17:04:03 2012
@@ -50,7 +50,7 @@
<% end %>
<% if has_variable?("hadoop_core_proxyusers") %>
-<% hadoop_core_proxyusers.each do |superuser, data| %>
+<% hadoop_core_proxyusers.sort.each do |superuser, data| %>
<property>
<name>hadoop.proxyuser.<%= superuser %>.hosts</name>
<value><%= data['hosts'] %></value>
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml?rev=1306467&r1=1306466&r2=1306467&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
Wed Mar 28 17:04:03 2012
@@ -20,7 +20,7 @@
<configuration>
<% if has_variable?("hadoop_core_proxyusers") -%>
-<% hadoop_core_proxyusers.each do |superuser, data| -%>
+<% hadoop_core_proxyusers.sort.each do |superuser, data| -%>
<property>
<name>httpfs.proxyuser.<%= superuser %>.hosts</name>
<value><%= data['hosts'] %></value>
