[kafka] branch trunk updated: MINOR: system tests - avoid 'sasl.enabled.mechanisms' in listener overrides (#7018)

[rs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rsivaram pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 5287036  MINOR: system tests - avoid 'sasl.enabled.mechanisms' in listener overrides (#7018)
5287036 is described below

commit 5287036b384570d5f7824f188d52200ea23216d5
Author: Brian Bushree <bb...@confluent.io>
AuthorDate: Wed Jul 3 04:17:17 2019 -0700

    MINOR: system tests - avoid 'sasl.enabled.mechanisms' in listener overrides (#7018)
    
    Reviewers: Rajini Sivaram <ra...@googlemail.com>
---
 tests/kafkatest/services/kafka/templates/kafka.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/kafkatest/services/kafka/templates/kafka.properties b/tests/kafkatest/services/kafka/templates/kafka.properties
index 6060bfa..25e4dcc 100644
--- a/tests/kafkatest/services/kafka/templates/kafka.properties
+++ b/tests/kafkatest/services/kafka/templates/kafka.properties
@@ -28,7 +28,7 @@ security.inter.broker.protocol={{ interbroker_listener.security_protocol }}
 {% endif %}
 
 {% for k, v in listener_security_config.client_listener_overrides.iteritems() %}
-{% if k.startswith('sasl.') %}
+{% if k in ["connections.max.reauth.ms", "sasl.jaas.config", "sasl.login.callback.handler.class", "sasl.login.class", "sasl.server.callback.handler.class"] %}
 listener.name.{{ security_protocol.lower() }}.{{ security_config.client_sasl_mechanism.lower() }}.{{ k }}={{ v }}
 {% else %}
 listener.name.{{ security_protocol.lower() }}.{{ k }}={{ v }}