Repository: bigtop Updated Branches: refs/heads/BIGTOP-2320 5fa37edfe -> 8ab85fe6c
BIGTOP-2325. Deployment recipes for HAWQ Parametrizing templates Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/8c6a393c Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/8c6a393c Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/8c6a393c Branch: refs/heads/BIGTOP-2320 Commit: 8c6a393c4d2d10175635689736405d579023c48c Parents: 5fa37ed Author: Konstantin Boudnik <[email protected]> Authored: Thu Feb 18 13:33:42 2016 +0300 Committer: Konstantin Boudnik <[email protected]> Committed: Thu Feb 18 13:33:42 2016 +0300 ---------------------------------------------------------------------- bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml | 3 +++ bigtop-deploy/puppet/modules/hawq/manifests/init.pp | 2 ++ bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/8c6a393c/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 de98502..74229ed 100644 --- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml +++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml @@ -174,3 +174,6 @@ zeppelin::server::spark_master_url: "yarn-client" zeppelin::server::hiveserver2_url: "jdbc:hive2://%{hiera('hadoop-hive::common::hiveserver2_host')}:%{hiera('hadoop-hive::common::hiveserver2_port')}" zeppelin::server::hiveserver2_user: "%{hiera('bigtop::hiveserver2_user')}" zeppelin::server::hiveserver2_password: "%{hiera('bigtop::hiveserver2_password')}" + +# hawq +hawq::head_node: "%{hiera('hawq::head_node')}" http://git-wip-us.apache.org/repos/asf/bigtop/blob/8c6a393c/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 ecd7926..c2d4180 100644 --- a/bigtop-deploy/puppet/modules/hawq/manifests/init.pp +++ b/bigtop-deploy/puppet/modules/hawq/manifests/init.pp @@ -23,6 +23,8 @@ 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") package { "hawq": ensure => latest, http://git-wip-us.apache.org/repos/asf/bigtop/blob/8c6a393c/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 f3620b6..10f165d 100644 --- a/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml +++ b/bigtop-deploy/puppet/modules/hawq/templates/hawq-site.xml @@ -22,13 +22,13 @@ under the License. <configuration> <property> <name>hawq_master_address_host</name> - <value>localhost</value> + <value><%= @hawq_head %></value> <description>The host name of hawq master.</description> </property> <property> <name>hawq_master_address_port</name> - <value>5432</value> + <value><%= @hawq_head_port %></value> <description>The port of hawq master.</description> </property>
