Repository: ambari Updated Branches: refs/heads/trunk 2c660d32e -> e68968dd9
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/e68968dd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e68968dd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e68968dd Branch: refs/heads/trunk Commit: e68968dd9bc0a20e26c10db6d00893cbc48ae4af Parents: 2c660d3 Author: Sumit Mohanty <[email protected]> Authored: Wed Apr 6 17:44:46 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Wed Apr 6 17:44:53 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/e68968dd/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..8d483dc 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 @@ -139,8 +139,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 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']),
