You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2016/07/05 18:59:19 UTC

ambari git commit: AMBARI-17520. Update the policy_user property to use storm user principal specified in Storms config. (Gautam Borad via rlevas)

Repository: ambari
Updated Branches:
  refs/heads/trunk 859a3758b -> bd99d76d3


AMBARI-17520.  Update the policy_user property to use storm user principal specified in Storms config. (Gautam Borad via rlevas)


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

Branch: refs/heads/trunk
Commit: bd99d76d3bc78e680e426970714b9ec18340a085
Parents: 859a375
Author: Gautam Borad <gb...@hortonworks.com>
Authored: Tue Jul 5 14:58:28 2016 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Tue Jul 5 14:58:34 2016 -0400

----------------------------------------------------------------------
 .../common-services/STORM/0.9.1/package/scripts/params_linux.py   | 3 ++-
 .../STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bd99d76d/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 fac6331..abe5084 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
@@ -243,7 +243,7 @@ storm_ui_port = config['configurations']['storm-site']['ui.port']
 repo_config_username = config['configurations']['ranger-storm-plugin-properties']['REPOSITORY_CONFIG_USERNAME']
 ranger_env = config['configurations']['ranger-env']
 ranger_plugin_properties = config['configurations']['ranger-storm-plugin-properties']
-policy_user = config['configurations']['ranger-storm-plugin-properties']['policy_user']
+policy_user = storm_user
 storm_cluster_log4j_content = config['configurations']['storm-cluster-log4j']['content']
 storm_worker_log4j_content = config['configurations']['storm-worker-log4j']['content']
 
@@ -315,6 +315,7 @@ 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['ambari.service.check.user'] = policy_user

http://git-wip-us.apache.org/repos/asf/ambari/blob/bd99d76d/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
index 2fee04f..9ba58b5 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.3/configuration/ranger-storm-plugin-properties.xml
@@ -21,7 +21,7 @@
 <configuration supports_final="true">
   <property>
     <name>policy_user</name>
-    <value>storm</value>
+    <value>{{policy_user}}</value>
     <display-name>Policy user for STORM</display-name>
     <description>This user must be system user and also present at Ranger admin portal</description>
     <on-ambari-upgrade add="true"/>