[bigtop] branch master updated: BIGTOP-3159. Failed to deploy Alluxio due to Puppet compatibility issue (#474)

[evansye]

This is an automated email from the ASF dual-hosted git repository.

evansye pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d29d3b  BIGTOP-3159. Failed to deploy Alluxio due to Puppet 
compatibility issue (#474)
1d29d3b is described below

commit 1d29d3b89fa7fbd81ff5e2f114e4f1576cdad14f
Author: Evans Ye <evan...@apache.org>
AuthorDate: Tue Feb 19 12:42:36 2019 +0800

    BIGTOP-3159. Failed to deploy Alluxio due to Puppet compatibility issue 
(#474)
---
 bigtop-deploy/puppet/modules/alluxio/manifests/init.pp              | 4 +++-
 .../puppet/modules/alluxio/templates/alluxio-site.properties        | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bigtop-deploy/puppet/modules/alluxio/manifests/init.pp 
b/bigtop-deploy/puppet/modules/alluxio/manifests/init.pp
index 6399b80..9200e92 100644
--- a/bigtop-deploy/puppet/modules/alluxio/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/alluxio/manifests/init.pp
@@ -21,7 +21,9 @@ class alluxio {
     }
   }
 
-  class common ($master_host, $hdfs_ha = hiera('hadoop::common_hdfs::ha', 
undef)) {
+  class common ($master_host,
+      $alluxio_underfs_address = hiera('bigtop::hadoop_namenode_uri'),
+  ) {
     package { "alluxio":
       ensure => latest,
     }
diff --git 
a/bigtop-deploy/puppet/modules/alluxio/templates/alluxio-site.properties 
b/bigtop-deploy/puppet/modules/alluxio/templates/alluxio-site.properties
index 99fefd8..3cf3d7a 100644
--- a/bigtop-deploy/puppet/modules/alluxio/templates/alluxio-site.properties
+++ b/bigtop-deploy/puppet/modules/alluxio/templates/alluxio-site.properties
@@ -18,11 +18,7 @@
 
 # Common properties
 alluxio.master.hostname=<%= @master_host %>
-<% if defined?(@hdfs_ha) and @hdfs_ha != "disabled" -%>
-alluxio.underfs.address=<%= 
scope().call_function('hiera',['hadoop_cluster_node::hadoop_namenode_uri']) 
%>/underFSStorage
-<% else -%>
-alluxio.underfs.address=hdfs://<%= 
scope().call_function('hiera',['hadoop::common_hdfs::hadoop_namenode_host']) 
%>:<%= scope().call_function('hiera', 
['hadoop::common_hdfs::hadoop_namenode_port']) %>/underFSStorage
-<% end -%>
+alluxio.underfs.address=<%= @alluxio_underfs_address %>/underFSStorage
 
 # Security properties
 # alluxio.security.authorization.permission.enabled=true