Repository: ambari
Updated Branches:
  refs/heads/trunk 63dab04d1 -> 499167caa


AMBARI-13829. Kafka listeners property should be configurable (sriharsha via 
swagle)


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

Branch: refs/heads/trunk
Commit: 499167caa323f87f4f358f3d1bc17b6d86cf6253
Parents: 63dab04
Author: Siddharth Wagle <swa...@hortonworks.com>
Authored: Wed Nov 18 13:41:22 2015 -0800
Committer: Siddharth Wagle <swa...@hortonworks.com>
Committed: Wed Nov 18 13:41:22 2015 -0800

----------------------------------------------------------------------
 .../common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/499167ca/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
index e445763..2bd93d2 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka.py
@@ -44,7 +44,9 @@ def kafka():
     #listeners and advertised.listeners are only added in 2.3.0.0 onwards.
     if params.hdp_stack_version != "" and 
compare_versions(params.hdp_stack_version, '2.3.0.0') >= 0:
         if params.security_enabled and params.kafka_kerberos_enabled:
-            listeners = kafka_server_config['listeners'].replace("localhost", 
params.hostname).replace("PLAINTEXT", "PLAINTEXTSASL")
+            listeners = kafka_server_config['listeners'].replace("localhost", 
params.hostname)
+            if "SASL" not in listeners:
+                listeners = listeners.replace("PLAINTEXT", "PLAINTEXTSASL")
             kafka_server_config['listeners'] = listeners
             kafka_server_config['advertised.listeners'] = listeners
         else:

Reply via email to