ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: Revert "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 Wed, 06 Apr 2016 22:56:25 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.2 8c02da6c7 -> 37d07967f


Revert "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)"

This reverts commit 8c02da6c7c669712a508781d5da03a98ab3673db.


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

Branch: refs/heads/branch-2.2
Commit: 37d07967f1491141aaeaf0a77d76a182a58b1ebe
Parents: 8c02da6
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Wed Apr 6 15:56:13 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Wed Apr 6 15:56:13 2016 -0700

----------------------------------------------------------------------
 .../KAFKA/0.8.1.2.2/package/scripts/params.py                | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/37d07967/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 f7c2362..fe4946c 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
@@ -137,9 +137,7 @@ if has_metric_collector:
 # 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" or
-                          config['configurations']['kafka-broker']['security.inter.broker.protocol']
== "SASL_PLAINTEXT")
-
+                          config['configurations']['kafka-broker']['security.inter.broker.protocol']
== "PLAINTEXTSASL")
 
 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()
@@ -179,7 +177,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']
@@ -188,7 +186,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