You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by ja...@apache.org on 2014/12/10 19:54:23 UTC
bigtop git commit: BIGTOP-1567. puppet cannot install components
whatever given to it
Repository: bigtop
Updated Branches:
refs/heads/master 6bae4a32b -> 5aabbcea2
BIGTOP-1567. puppet cannot install components whatever given to it
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/5aabbcea
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/5aabbcea
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/5aabbcea
Branch: refs/heads/master
Commit: 5aabbcea2f2076f3c024c0d19c54bc4f54111d06
Parents: 6bae4a3
Author: evans_ye <in...@gmail.com>
Authored: Thu Dec 11 00:16:49 2014 +0800
Committer: jayunit100 <ja...@apache.org>
Committed: Wed Dec 10 13:53:37 2014 -0500
----------------------------------------------------------------------
bigtop-deploy/puppet/manifests/cluster.pp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/5aabbcea/bigtop-deploy/puppet/manifests/cluster.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp
index 633d07b..d83b536 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -74,9 +74,14 @@ class hadoop_cluster_node {
$spark_master_ui_port = extlookup("spark_master_ui_port", "18080")
# Lookup comma separated components (i.e. hadoop,spark,hbase ).
- $components_str = extlookup("components")
+ $components_tmp = extlookup("components", split($components, ","))
# Ensure (even if a single value) that the type is an array.
- $components = any2array($components_str,",")
+ if is_array($components_tmp) {
+ $components = $components_tmp
+ }
+ else {
+ $components = any2array($components_tmp,",")
+ }
$all = ($components[0] == undef)