bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject [42/51] [abbrv] bigtop git commit: BIGTOP-2466: HBase puppet scripts co-deploy ZK and Datanode along with HBase (closes #124)
Date Fri, 29 Jul 2016 17:03:23 GMT
BIGTOP-2466: HBase puppet scripts co-deploy ZK and Datanode along with HBase (closes #124)


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

Branch: refs/heads/BIGTOP-2253
Commit: 93f0cc08824c3c59d2d3727d282125b446782dcc
Parents: 36bf0a7
Author: Konstantinos Tsakalozos <konstantinos.tsakalozos@canonical.com>
Authored: Fri Jun 3 10:22:46 2016 +0300
Committer: Roman Shaposhnik <rvs@apache.org>
Committed: Mon Jul 18 15:57:07 2016 -0700

----------------------------------------------------------------------
 bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml          | 1 +
 bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/93f0cc08/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 62256d5..55f5bcd 100644
--- a/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
+++ b/bigtop-deploy/puppet/hieradata/bigtop/cluster.yaml
@@ -122,6 +122,7 @@ hadoop_hbase::common_config::rootdir: "%{hiera('bigtop::hadoop_namenode_uri')}%{
 hadoop_hbase::common_config::zookeeper_quorum: "%{hiera('bigtop::hadoop_head_node')}"
 hadoop_hbase::common_config::kerberos_realm: "%{hiera('kerberos::site::realm')}"
 hadoop_hbase::client::thrift: true
+hadoop_hbase::deploy::auxiliary: true
 
 solr::server::root_url: "%{hiera('bigtop::hadoop_namenode_uri')}"
 solr::server::zk: "%{hiera('hadoop::zk')}"

http://git-wip-us.apache.org/repos/asf/bigtop/blob/93f0cc08/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp b/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp
index 1527260..a168e34 100644
--- a/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/hadoop_hbase/manifests/init.pp
@@ -15,15 +15,19 @@
 
 class hadoop_hbase {
 
-  class deploy ($roles) {
+  class deploy ($roles, $auxiliary = true) {
     if ("hbase-server" in $roles) {
       include hadoop_hbase::server
     }
 
     if ("hbase-master" in $roles) {
+      if ($auxiliary == true) {
+        include hadoop_zookeeper::server
+      }
+
+      include hadoop::common_hdfs
       include hadoop::init_hdfs
       include hadoop_hbase::master
-      include hadoop_zookeeper::server
       Class['Hadoop::Init_hdfs'] -> Class['Hadoop_hbase::Master']
     }
 


Mime
View raw message