You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2013/03/28 23:23:50 UTC
git commit: BIGTOP-275. scoping of variable in puppet code is
incorrect
Updated Branches:
refs/heads/master c74fbe7c3 -> ef5db9627
BIGTOP-275. scoping of variable in puppet code is incorrect
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ef5db962
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ef5db962
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ef5db962
Branch: refs/heads/master
Commit: ef5db96277464b97ea0942202fe9929ea3c1da04
Parents: c74fbe7
Author: Konstantin Boudnik <Konstantin Boudnik cos@apache.org>
Authored: Thu Mar 28 15:14:03 2013 -0700
Committer: Konstantin Boudnik <Konstantin Boudnik cos@apache.org>
Committed: Thu Mar 28 15:14:03 2013 -0700
----------------------------------------------------------------------
.../modules/hadoop-hbase/templates/hbase-env.sh | 4 ++--
.../modules/hadoop-hbase/templates/hbase-site.xml | 10 +++++-----
.../puppet/modules/hadoop/templates/core-site.xml | 2 +-
.../puppet/modules/hadoop/templates/hdfs-site.xml | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ef5db962/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh b/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh
index 2d10f8c..2f96581 100644
--- a/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh
+++ b/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-env.sh
@@ -28,7 +28,7 @@
export HBASE_CLASSPATH=/etc/hadoop/conf
# The maximum amount of heap to use, in MB. Default is 1000.
-export HBASE_HEAPSIZE=<%= heap_size %>
+export HBASE_HEAPSIZE=<%= @heap_size %>
# Extra Java runtime options.
# Below are what we set by default. May only work with SUN JVM.
@@ -36,7 +36,7 @@ export HBASE_HEAPSIZE=<%= heap_size %>
# see http://wiki.apache.org/hadoop/PerformanceTuning
export HBASE_OPTS="$HBASE_OPTS -ea -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode"
-<% if kerberos_realm != "" -%>
+<% if @kerberos_realm != "" -%>
# Secure Zookeeper settings
export HBASE_MASTER_OPTS="$HBASE_MASTER_OPTS -Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf"
export HBASE_REGIONSERVER_OPTS="$HBASE_REGIONSERVER_OPTS -Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ef5db962/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-site.xml b/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-site.xml
index e4bedb8..8489a93 100644
--- a/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop-hbase/templates/hbase-site.xml
@@ -29,12 +29,12 @@
<property>
<name>hbase.zookeeper.quorum</name>
- <value><%= zookeeper_quorum %></value>
+ <value><%= @zookeeper_quorum %></value>
</property>
<property>
<name>hbase.rootdir</name>
- <value><%= rootdir %></value>
+ <value><%= @rootdir %></value>
</property>
<property>
@@ -49,10 +49,10 @@
</property>
<% end %>
-<% if kerberos_realm != "" %>
+<% if @kerberos_realm != "" %>
<property>
<name>hbase.regionserver.kerberos.principal</name>
- <value>hbase/_HOST@<%= kerberos_realm %></value>
+ <value>hbase/_HOST@<%= @kerberos_realm %></value>
</property>
<property>
<name>hbase.regionserver.keytab.file</name>
@@ -60,7 +60,7 @@
</property>
<property>
<name>hbase.master.kerberos.principal</name>
- <value>hbase/_HOST@<%= kerberos_realm %></value>
+ <value>hbase/_HOST@<%= @kerberos_realm %></value>
</property>
<property>
<name>hbase.master.keytab.file</name>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ef5db962/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
index 419ad00..1a6daf3 100644
--- a/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
@@ -22,7 +22,7 @@
<property>
<!-- URI of NN. Fully qualified. No IP.-->
<name>fs.defaultFS</name>
-<% if ha != "disabled" -%>
+<% if @ha != "disabled" -%>
<value>hdfs://<%= nameservice_id %></value>
<% else -%>
<value>hdfs://<%= namenode_hosts[0] %>:<%= hadoop_namenode_port%></value>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ef5db962/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
index 97a9a67..9302b50 100644
--- a/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
@@ -19,10 +19,10 @@
<% namenode_hosts = Array(hadoop_namenode_host) -%>
<configuration>
-<% if ha != "disabled" -%>
+<% if @ha != "disabled" -%>
<!-- HA -->
-<% if ha == "auto" -%>
+<% if @ha == "auto" -%>
<property>
<name>dfs.ha.automatic-failover.enabled</name>
<value>true</value>