You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/06/26 18:54:05 UTC

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

Repository: ambari
Updated Branches:
  refs/heads/trunk bc8e32e98 -> e229e7b77


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/e229e7b7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e229e7b7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e229e7b7

Branch: refs/heads/trunk
Commit: e229e7b779edbdd10db4dae001680dbe56372409
Parents: bc8e32e
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Jun 26 09:53:54 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Jun 26 09:53:54 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/e229e7b7/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)