bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From evan...@apache.org
Subject bigtop git commit: BIGTOP-2675. [Puppet] Kafka can only be deployed on master node
Date Tue, 28 Mar 2017 18:27:37 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master 970be8740 -> 738ff0746


BIGTOP-2675. [Puppet] Kafka can only be deployed on master node


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

Branch: refs/heads/master
Commit: 738ff07466a3ab7641eb165124448323c9159e00
Parents: 970be87
Author: Evans Ye <evansye@apache.org>
Authored: Wed Mar 29 02:27:58 2017 +0800
Committer: Evans Ye <evansye@apache.org>
Committed: Wed Mar 29 02:31:51 2017 +0800

----------------------------------------------------------------------
 bigtop-deploy/puppet/manifests/cluster.pp                     | 2 +-
 bigtop-deploy/puppet/modules/kafka/manifests/init.pp          | 1 -
 .../puppet/modules/kafka/templates/server.properties          | 7 ++++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/738ff074/bigtop-deploy/puppet/manifests/cluster.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/manifests/cluster.pp b/bigtop-deploy/puppet/manifests/cluster.pp
index 56b6fbf..83bb7b2 100644
--- a/bigtop-deploy/puppet/manifests/cluster.pp
+++ b/bigtop-deploy/puppet/manifests/cluster.pp
@@ -143,7 +143,7 @@ $roles_map = {
     worker => ["gpdb-segment"],
   },
   kafka => {
-    master => ["kafka-server"],
+    worker => ["kafka-server"],
   },
   ambari => {
     master => ["ambari-server"],

http://git-wip-us.apache.org/repos/asf/bigtop/blob/738ff074/bigtop-deploy/puppet/modules/kafka/manifests/init.pp
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/kafka/manifests/init.pp b/bigtop-deploy/puppet/modules/kafka/manifests/init.pp
index 736cfe0..d20948a 100644
--- a/bigtop-deploy/puppet/modules/kafka/manifests/init.pp
+++ b/bigtop-deploy/puppet/modules/kafka/manifests/init.pp
@@ -23,7 +23,6 @@ class kafka {
 
   class server(
       $bind_addr = undef,
-      $broker_id = "0",
       $port = "9092",
       $zookeeper_connection_string = "localhost:2181",
     ) {

http://git-wip-us.apache.org/repos/asf/bigtop/blob/738ff074/bigtop-deploy/puppet/modules/kafka/templates/server.properties
----------------------------------------------------------------------
diff --git a/bigtop-deploy/puppet/modules/kafka/templates/server.properties b/bigtop-deploy/puppet/modules/kafka/templates/server.properties
index dbda311..6372812 100644
--- a/bigtop-deploy/puppet/modules/kafka/templates/server.properties
+++ b/bigtop-deploy/puppet/modules/kafka/templates/server.properties
@@ -17,7 +17,12 @@
 ############################# Server Basics #############################
 
 # The id of the broker. This must be set to a unique integer for each broker.
-broker.id=<%= @broker_id %>
+broker.id=-1
+
+# Enable automatic broker id generation on the server. When enabled the value
+# configured for reserved.broker.max.id should be reviewed.
+broker.id.generation.enable=true
+reserved.broker.max.id=1000
 
 ############################# Socket Server Settings #############################
 


Mime
View raw message