Repository: ambari Updated Branches: refs/heads/trunk d4f2d9993 -> 548ed9fda
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 fd3692ecf23bfcccaeb4b83aa95735e084ca8f2b. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/548ed9fd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/548ed9fd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/548ed9fd Branch: refs/heads/trunk Commit: 548ed9fdabf8c711d507abb080bab24ec78b501a Parents: d4f2d99 Author: Sumit Mohanty <[email protected]> Authored: Wed Apr 6 15:57:07 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Wed Apr 6 15:57:07 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/548ed9fd/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 0012885..b18e62d 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,9 +140,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 stack_version_formatted != "" and 'kafka_principal_name' in config['configurations']['kafka-env'] \ and check_stack_feature(StackFeature.KAFKA_KERBEROS, stack_version_formatted): @@ -182,7 +180,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'] @@ -191,7 +189,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']),
