ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject [1/2] ambari git commit: AMBARI-16811: Kafka broker and RM start fail after Ambari upgrade (gautam)
Date Mon, 23 May 2016 16:17:37 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 7dfce9b11 -> a514c147a
  refs/heads/trunk 3862519d1 -> 095f220c4


AMBARI-16811: Kafka broker and RM start fail after Ambari upgrade
(gautam)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/095f220c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/095f220c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/095f220c

Branch: refs/heads/trunk
Commit: 095f220c4458f1421b046a6a9daa7435ec06e412
Parents: 3862519
Author: Gautam Borad <gautam@apache.org>
Authored: Fri May 20 11:41:03 2016 +0530
Committer: Gautam Borad <gautam@apache.org>
Committed: Mon May 23 21:47:02 2016 +0530

----------------------------------------------------------------------
 .../libraries/functions/ranger_functions_v2.py               | 8 ++++----
 .../libraries/functions/setup_ranger_plugin_xml.py           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/095f220c/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
index a486da7..efb0819 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
@@ -98,9 +98,9 @@ class RangeradminV2:
 
   def create_ranger_repository(self, component, repo_name, repo_properties,
                                ambari_ranger_admin, ambari_ranger_password,
-                               admin_uname, admin_password, policy_user, is_security_enabled
= False, component_user = None,
-                               component_user_principal = None, component_user_keytab = None):
-    if not is_security_enabled :
+                               admin_uname, admin_password, policy_user, is_security_enabled
= False, is_stack_supports_ranger_kerberos = False,
+                               component_user = None, component_user_principal = None, component_user_keytab
= None):
+    if not is_stack_supports_ranger_kerberos :
       response_code = self.check_ranger_login_urllib2(self.base_url)
       repo_data = json.dumps(repo_properties)
       ambari_ranger_password = unicode(ambari_ranger_password)
@@ -134,7 +134,7 @@ class RangeradminV2:
           Logger.error('Ambari admin user creation failed')
       elif not self.skip_if_rangeradmin_down:
         Logger.error("Connection failed to Ranger Admin !")
-    else:
+    elif is_stack_supports_ranger_kerberos and is_security_enabled:
       response = self.check_ranger_login_curl(component_user,component_user_keytab,component_user_principal,self.base_url,True)
 
       if response and response[0] == 200:

http://git-wip-us.apache.org/repos/asf/ambari/blob/095f220c/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
index 0fb017d..80e5664 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
@@ -77,7 +77,7 @@ def setup_ranger_plugin(component_select_name, service_name, previous_jdbc_jar,
       ranger_adm_obj.create_ranger_repository(service_name, repo_name, plugin_repo_dict,
                                               ranger_env_properties['ranger_admin_username'],
ranger_env_properties['ranger_admin_password'],
                                               ranger_env_properties['admin_username'], ranger_env_properties['admin_password'],
-                                              policy_user,is_security_enabled,component_user,component_user_principal,component_user_keytab)
+                                              policy_user,is_security_enabled,is_stack_supports_ranger_kerberos,component_user,component_user_principal,component_user_keytab)
 
     else:
       ranger_adm_obj = Rangeradmin(url=policymgr_mgr_url, skip_if_rangeradmin_down=skip_if_rangeradmin_down)


Mime
View raw message