ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: Ambari-15747. Kafka jaas files are not generated on a Kafa upgrade if security.inter.broker.protocol is set to SASL_PLAINTEXT (Sriharsha Chintalapani via smohanty)
Date Thu, 07 Apr 2016 00:45:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 37d07967f -> 18aa22966


Ambari-15747. Kafka jaas files are not generated on a Kafa upgrade if security.inter.broker.protocol
is set to SASL_PLAINTEXT (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/18aa2296
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18aa2296
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18aa2296

Branch: refs/heads/branch-2.2
Commit: 18aa22966e6383b1c320b7576093f7a4d77e7aa2
Parents: 37d0796
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Wed Apr 6 17:44:46 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Wed Apr 6 17:45:24 2016 -0700

----------------------------------------------------------------------
 .../KAFKA/0.8.1.2.2/package/scripts/params.py             | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/18aa2296/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 fe4946c..f7182d3 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
@@ -136,8 +136,10 @@ if has_metric_collector:
   pass
 # Security-related params
 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")
+kafka_kerberos_enabled = (('security.inter.broker.protocol' in config['configurations']['kafka-broker'])
and
+                         ((config['configurations']['kafka-broker']['security.inter.broker.protocol']
== "PLAINTEXTSASL") or
+                          (config['configurations']['kafka-broker']['security.inter.broker.protocol']
== "SASL_PLAINTEXT")))
+
 
 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()
@@ -177,7 +179,7 @@ if has_ranger_admin and is_supported_kafka_ranger:
 
   ranger_env = config['configurations']['ranger-env']
   ranger_plugin_properties = config['configurations']['ranger-kafka-plugin-properties']
-  
+
   ranger_kafka_audit = config['configurations']['ranger-kafka-audit']
   ranger_kafka_audit_attrs = config['configuration_attributes']['ranger-kafka-audit']
   ranger_kafka_security = config['configurations']['ranger-kafka-security']
@@ -186,7 +188,7 @@ if has_ranger_admin and is_supported_kafka_ranger:
   ranger_kafka_policymgr_ssl_attrs = config['configuration_attributes']['ranger-kafka-policymgr-ssl']
 
   policy_user = config['configurations']['ranger-kafka-plugin-properties']['policy_user']
-  
+
   ranger_plugin_config = {
     'username' : config['configurations']['ranger-kafka-plugin-properties']['REPOSITORY_CONFIG_USERNAME'],
     'password' : unicode(config['configurations']['ranger-kafka-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']),


Mime
View raw message