You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/02/10 07:04:02 UTC
[4/50] [abbrv] git commit: BIGTOP-794. puppet code around
hadoop_head_node breaks on newer puppets
BIGTOP-794. puppet code around hadoop_head_node breaks on newer puppets
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/df7b3a74
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/df7b3a74
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/df7b3a74
Branch: refs/heads/RCs
Commit: df7b3a744ad64c40a7344a83ff60e7fdde7869ca
Parents: f9de13b
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Mon Nov 26 10:45:36 2012 -0800
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Mon Nov 26 16:21:20 2012 -0800
----------------------------------------------------------------------
.../puppet/modules/hadoop/manifests/init.pp | 6 +++---
.../puppet/modules/hadoop/templates/core-site.xml | 2 +-
.../puppet/modules/hadoop/templates/hdfs-site.xml | 2 +-
.../modules/hadoop/templates/httpfs-site.xml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/df7b3a74/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
index b202e3f..f44b60e 100644
--- a/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
@@ -236,7 +236,7 @@ class hadoop {
define namenode ($host = $fqdn , $port = "8020", $thrift_port= "10090", $auth = "simple", $dirs = ["/tmp/nn"], $ha = 'disabled', $zk = '') {
- $first_namenode = inline_template("<%= host.to_a[0] %>")
+ $first_namenode = inline_template("<%= Array(host)[0] %>")
$hadoop_namenode_host = $host
$hadoop_namenode_port = $port
$hadoop_namenode_thrift_port = $thrift_port
@@ -553,8 +553,8 @@ class hadoop {
include common-mapred-app
- # FIXME: "hadoop-source", "hadoop-fuse", "hadoop-pipes"
- package { ["hadoop-doc", "hadoop-debuginfo", "hadoop-libhdfs"]:
+ # FIXME: "hadoop-source", "hadoop-fuse", "hadoop-pipes", "hadoop-debuginfo"
+ package { ["hadoop-doc", "hadoop-libhdfs"]:
ensure => latest,
require => [Package["jdk"], Package["hadoop"], Package["hadoop-hdfs"], Package["hadoop-mapreduce"]],
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/df7b3a74/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 eaefd39..419ad00 100644
--- a/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop/templates/core-site.xml
@@ -16,7 +16,7 @@
<!-- See the License for the specific language governing permissions and -->
<!-- limitations under the License. -->
-<% namenode_hosts = hadoop_namenode_host.to_a -%>
+<% namenode_hosts = Array(hadoop_namenode_host) -%>
<configuration>
<property>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/df7b3a74/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 e38c6be..97a9a67 100644
--- a/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop/templates/hdfs-site.xml
@@ -16,7 +16,7 @@
<!-- See the License for the specific language governing permissions and -->
<!-- limitations under the License. -->
-<% namenode_hosts = hadoop_namenode_host.to_a -%>
+<% namenode_hosts = Array(hadoop_namenode_host) -%>
<configuration>
<% if ha != "disabled" -%>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/df7b3a74/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml b/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
index bc00a1c..85cf4a6 100644
--- a/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
+++ b/bigtop-deploy/puppet/modules/hadoop/templates/httpfs-site.xml
@@ -16,7 +16,7 @@
<!-- See the License for the specific language governing permissions and -->
<!-- limitations under the License. -->
-<% namenode_hosts = hadoop_namenode_host.to_a -%>
+<% namenode_hosts = Array(hadoop_namenode_host) -%>
<configuration>
<property>
<name>httpfs.hadoop.config.dir</name>