Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 54074bec5 -> 975b23d2b


AMBARI-12158. Support Kafka rolling upgrade in secure cluster for older version 
of kafka (Sriharsha Chintalapani via smohanty)


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

Branch: refs/heads/branch-2.1
Commit: 975b23d2bee0b5f1fdb9dc680352462dcf164a5d
Parents: 54074be
Author: Sumit Mohanty <[email protected]>
Authored: Fri Jun 26 09:53:54 2015 -0700
Committer: Sumit Mohanty <[email protected]>
Committed: Fri Jun 26 09:54:33 2015 -0700

----------------------------------------------------------------------
 .../common-services/KAFKA/0.8.1.2.2/package/scripts/params.py     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/975b23d2/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
----------------------------------------------------------------------
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
index f09bb29..455bd00 100644
--- 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
@@ -108,8 +108,7 @@ security_enabled = 
config['configurations']['cluster-env']['security_enabled']
 kafka_kerberos_enabled = ('security.inter.broker.protocol' in 
config['configurations']['kafka-broker'] and
                           
config['configurations']['kafka-broker']['security.inter.broker.protocol'] == 
"PLAINTEXTSASL")
 
-print kafka_kerberos_enabled
-if security_enabled and hdp_stack_version != "" and 
compare_versions(hdp_stack_version, '2.3') >= 0:
+if security_enabled and hdp_stack_version != "" and 'kafka_principal_name' in 
config['configurations']['kafka-env'] and compare_versions(hdp_stack_version, 
'2.3') >= 0:
     _hostname_lowercase = config['hostname'].lower()
     _kafka_principal_name = 
config['configurations']['kafka-env']['kafka_principal_name']
     kafka_jaas_principal = 
_kafka_principal_name.replace('_HOST',_hostname_lowercase)

Reply via email to