ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-13823. kafka-broker/authorizer.class.name is not removed when kerberos is disabled. (addendum patch) (jaimin)
Date Wed, 11 Nov 2015 00:37:47 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk fa4409ae5 -> 67b18c127


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/67b18c12
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67b18c12
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67b18c12

Branch: refs/heads/trunk
Commit: 67b18c127cb6600cce2bfdee2c6083497f60a624
Parents: fa4409a
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Tue Nov 10 16:34:29 2015 -0800
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Tue Nov 10 16:37:39 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/67b18c12/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 38cba97..33d58e0 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
@@ -390,15 +390,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')
 
 


Mime
View raw message