ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smoha...@apache.org
Subject ambari git commit: AMBARI-18053. Use correct storm principal when Ranger Storm plugin is enabled (Mugdha Varadkar via smohanty)
Date Sat, 06 Aug 2016 14:42:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e5d35e752 -> e6ed54e6e


AMBARI-18053. Use correct storm principal when Ranger Storm plugin is enabled (Mugdha Varadkar
via smohanty)


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

Branch: refs/heads/trunk
Commit: e6ed54e6e14b25420bd9461aa3bff647dc7fc6e9
Parents: e5d35e7
Author: Sumit Mohanty <smohanty@hortonworks.com>
Authored: Sat Aug 6 07:40:40 2016 -0700
Committer: Sumit Mohanty <smohanty@hortonworks.com>
Committed: Sat Aug 6 07:42:16 2016 -0700

----------------------------------------------------------------------
 .../STORM/0.9.1/package/scripts/params_linux.py        | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e6ed54e6/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
index 4fa318b..d0ac3a4 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/package/scripts/params_linux.py
@@ -332,8 +332,8 @@ if has_ranger_admin:
 
   if stack_supports_ranger_kerberos and security_enabled:
     policy_user = format('{storm_user},{storm_bare_jaas_principal}')
-    storm_ranger_plugin_config['policy.download.auth.users'] = storm_user
-    storm_ranger_plugin_config['tag.download.auth.users'] = storm_user
+    storm_ranger_plugin_config['policy.download.auth.users'] = policy_user
+    storm_ranger_plugin_config['tag.download.auth.users'] = policy_user
     storm_ranger_plugin_config['ambari.service.check.user'] = policy_user
 
     storm_ranger_plugin_repo = {
@@ -346,12 +346,9 @@ if has_ranger_admin:
 
   ranger_storm_principal = None
   ranger_storm_keytab = None
-  if stack_supports_ranger_kerberos and security_enabled and 'storm-nimbus' in status_params.component_directory.lower():
-    ranger_storm_principal = nimbus_jaas_principal
-    ranger_storm_keytab = nimbus_keytab_path
-  elif stack_supports_ranger_kerberos and security_enabled and 'storm-client' in status_params.component_directory.lower():
-    ranger_storm_principal = storm_ui_jaas_principal
-    ranger_storm_keytab = storm_ui_keytab_path
+  if stack_supports_ranger_kerberos and security_enabled:
+    ranger_storm_principal = storm_jaas_principal
+    ranger_storm_keytab = storm_keytab_path
 
   xa_audit_db_is_enabled = False
   ranger_audit_solr_urls = config['configurations']['ranger-admin-site']['ranger.audit.solr.urls']


Mime
View raw message