Repository: ambari Updated Branches: refs/heads/branch-2.1 33abeec7c -> b5796290b
AMBARI-13823. kafka-broker/authorizer.class.name is not removed when kerberos is disabled. (addendum patch) (jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b5796290 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b5796290 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b5796290 Branch: refs/heads/branch-2.1 Commit: b5796290bccdf796cf600740c775ab813e65fa3b Parents: 33abeec Author: Jaimin Jetly <jai...@hortonworks.com> Authored: Tue Nov 10 16:34:29 2015 -0800 Committer: Jaimin Jetly <jai...@hortonworks.com> Committed: Tue Nov 10 16:35:05 2015 -0800 ---------------------------------------------------------------------- .../main/resources/stacks/HDP/2.3/services/stack_advisor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b5796290/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py index a39aa1a..7d2b625 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py @@ -320,15 +320,15 @@ class HDP23StackAdvisor(HDP22StackAdvisor): else: # Kerberized Cluster with Ranger plugin disabled - if security_enabled and 'authorizer.class.name' in services['configurations']['kafka-broker']['properties'] and \ + if security_enabled and 'kafka-broker' in services['configurations'] and 'authorizer.class.name' in services['configurations']['kafka-broker']['properties'] and \ services['configurations']['kafka-broker']['properties']['authorizer.class.name'] == 'org.apache.ranger.authorization.kafka.authorizer.RangerKafkaAuthorizer': putKafkaBrokerProperty("authorizer.class.name", 'kafka.security.auth.SimpleAclAuthorizer') # Non-kerberos Cluster with Ranger plugin disabled - elif 'authorizer.class.name' in services['configurations']['kafka-broker']['properties']: + else: putKafkaBrokerAttributes('authorizer.class.name', 'delete', 'true') # Non-Kerberos Cluster without Ranger - elif not security_enabled and 'authorizer.class.name' in services['configurations']['kafka-broker']['properties']: + elif not security_enabled: putKafkaBrokerAttributes('authorizer.class.name', 'delete', 'true')
