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 2016/04/06 23:16:24 UTC
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)
Repository: ambari
Updated Branches:
refs/heads/trunk b02680091 -> fd3692ecf
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/fd3692ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd3692ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd3692ec
Branch: refs/heads/trunk
Commit: fd3692ecf23bfcccaeb4b83aa95735e084ca8f2b
Parents: b026800
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Wed Apr 6 14:14:53 2016 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Wed Apr 6 14:14:53 2016 -0700
----------------------------------------------------------------------
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd3692ec/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 b18e62d..0012885 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
@@ -140,7 +140,9 @@ 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")
+ (config['configurations']['kafka-broker']['security.inter.broker.protocol'] == "PLAINTEXTSASL" or
+ config['configurations']['kafka-broker']['security.inter.broker.protocol'] == "SASL_PLAINTEXT")
+
if security_enabled and stack_version_formatted != "" and 'kafka_principal_name' in config['configurations']['kafka-env'] \
and check_stack_feature(StackFeature.KAFKA_KERBEROS, stack_version_formatted):
@@ -180,7 +182,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']
@@ -189,7 +191,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']),