bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [1/2] bigtop git commit: BIGTOP-2325. Deployment recipes for HAWQ [Forced Update!]
Date Thu, 18 Feb 2016 15:35:43 GMT
Repository: bigtop
Updated Branches:
  refs/heads/BIGTOP-2320 b1839258b -> 772acd189 (forced update)


BIGTOP-2325. Deployment recipes for HAWQ

Adding yarn RM address


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/e08eb34a
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/e08eb34a
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/e08eb34a

Branch: refs/heads/BIGTOP-2320
Commit: e08eb34af05841cff3ca5c3cba7ec715f0b5ad41
Parents: 8c6a393
Author: Konstantin Boudnik <cos@apache.org>
Authored: Thu Feb 18 16:49:04 2016 +0300
Committer: Konstantin Boudnik <cos@apache.org>
Committed: Thu Feb 18 18:20:10 2016 +0300

----------------------------------------------------------------------
 bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml        | 3 ++-
 bigtop-deploy/puppet/modules/hawq/manifests/init.pp       | 6 ++++--
 bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/e08eb34a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
index 74229ed..eb604ca 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
@@ -176,4 +176,5 @@ zeppelin::server::hiveserver2_user: "%{hiera('bigtop::hiveserver2_user')}"
 zeppelin::server::hiveserver2_password: "%{hiera('bigtop::hiveserver2_password')}"
 
 # hawq
-hawq::head_node:	"%{hiera('hawq::head_node')}"
+bigtop::hawq_master_node:	"%{hiera('bigtop::hawq_master_node')}"
+bigtop::hawq_master_port:	"5432"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/e08eb34a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
index c2d4180..23c566b 100644
--- a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp
@@ -23,8 +23,10 @@ class hawq {
   define cluster_node() {
     $hadoop_head_node = hiera("bigtop::hadoop_head_node")
     $hadoop_namenode_port = hiera("hadoop::common_hdfs::hadoop_namenode_port", "8020")
-    $hawq_head = hiera("hawq::head_node", "localhost")
-    $hawq_head_port = hiera('hawq::master_port', "5432")
+    $hawq_head = hiera("bigtop::hawq_master_node", "localhost")
+    $hawq_head_port = hiera('bigtop::hawq_master_port', "5432")
+    $hawq_yarn_rm_host = hiera('hadoop::common_yarn::hadoop_rm_host')
+    $hawq_yarn_rm_port = hiera('hadoop::common_yarn::hadoop_rm_port')
 
     package { "hawq":
       ensure  => latest,

http://git-wip-us.apache.org/repos/asf/bigtop/blob/e08eb34a/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml b/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
index 10f165d..74909ef 100644
--- a/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
+++ b/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml
@@ -46,7 +46,7 @@ under the License.
 
   <property>
     <name>hawq_dfs_url</name>
-    <value>localhost:8020/hawq_default</value>
+    <value><%= @hadoop_head_node %>:<%= @hadoop_namenode_port %>/hawq_default</value>
     <description>URL for accessing HDFS.</description>
   </property>
 
@@ -103,7 +103,7 @@ under the License.
 
   <property>
     <name>hawq_rm_yarn_address</name>
-    <value>localhost:8032</value>
+    <value><%= @hawq_yarn_rm_host %>:<%= @hawq_yarn_rm_port %></value>
     <description>The address of YARN resource manager server.</description>
   </property>
 


Mime
View raw message