Repository: ambari Updated Branches: refs/heads/trunk 7155e8e72 -> 7a1871865
AMBARI-17861. Ambari principal should be part of nimbus.admins for Storm View (Sriharsha Chintalapani via smohanty) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7a187186 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7a187186 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7a187186 Branch: refs/heads/trunk Commit: 7a1871865019d607a6a1219edbdd831500fe7c01 Parents: 7155e8e Author: Sumit Mohanty <[email protected]> Authored: Fri Jul 22 17:42:52 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Fri Jul 22 17:42:52 2016 -0700 ---------------------------------------------------------------------- .../common-services/STORM/0.9.1/package/scripts/params_linux.py | 3 +++ .../src/main/resources/common-services/STORM/1.0.1/kerberos.json | 2 +- .../src/test/python/stacks/2.1/configs/secured-storm-start.json | 3 ++- ambari-server/src/test/python/stacks/2.1/configs/secured.json | 3 ++- .../src/test/python/stacks/2.3/configs/storm_default_secure.json | 3 ++- 5 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7a187186/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 1481a3f..1b7446b 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 @@ -144,6 +144,8 @@ if security_enabled: _hostname_lowercase = config['hostname'].lower() _storm_principal_name = config['configurations']['storm-env']['storm_principal_name'] storm_jaas_principal = _storm_principal_name.replace('_HOST',_hostname_lowercase) + _ambari_principal_name = config['configurations']['cluster-env']['ambari_principal_name'] + ambari_bare_jaas_principal = get_bare_principal(_ambari_principal_name) storm_keytab_path = config['configurations']['storm-env']['storm_keytab'] if stack_supports_storm_kerberos: @@ -151,6 +153,7 @@ if security_enabled: _storm_ui_jaas_principal_name = config['configurations']['storm-env']['storm_ui_principal_name'] storm_ui_jaas_principal = _storm_ui_jaas_principal_name.replace('_HOST',_hostname_lowercase) storm_bare_jaas_principal = get_bare_principal(_storm_principal_name) + ambari_bare_jaas_principal = get_bare_principal(_ambari_principal_name) _nimbus_principal_name = config['configurations']['storm-env']['nimbus_principal_name'] nimbus_jaas_principal = _nimbus_principal_name.replace('_HOST', _hostname_lowercase) nimbus_bare_jaas_principal = get_bare_principal(_nimbus_principal_name) http://git-wip-us.apache.org/repos/asf/ambari/blob/7a187186/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json index 8c0b517..f9fa30d 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json @@ -51,7 +51,7 @@ "java.security.auth.login.config": "{{conf_dir}}/storm_jaas.conf", "nimbus.impersonation.authorizer": "org.apache.storm.security.auth.authorizer.ImpersonationAuthorizer", "nimbus.impersonation.acl": "{ {{storm_bare_jaas_principal}} : {hosts: ['*'], groups: ['*']}}", - "nimbus.admins": "['{{storm_bare_jaas_principal}}']", + "nimbus.admins": "['{{storm_bare_jaas_principal}}', '{{ambari_bare_jaas_principal}}']", "nimbus.supervisor.users": "['{{storm_bare_jaas_principal}}']", "ui.filter.params": "{'type': 'kerberos', 'kerberos.principal': '{{storm_ui_jaas_principal}}', 'kerberos.keytab': '{{storm_ui_keytab_path}}', 'kerberos.name.rules': 'DEFAULT'}" } http://git-wip-us.apache.org/repos/asf/ambari/blob/7a187186/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json index 9c6e128..9bd239c 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json @@ -339,7 +339,8 @@ "kerberos_domain": "EXAMPLE.COM", "kinit_path_local": "/usr/bin", "user_group": "hadoop", - "smokeuser": "ambari-qa" + "smokeuser": "ambari-qa", + "ambari_principal_name": "ambari-server" } }, "configurationTags": { http://git-wip-us.apache.org/repos/asf/ambari/blob/7a187186/ambari-server/src/test/python/stacks/2.1/configs/secured.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json index b847f3a..a2af06a 100644 --- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json +++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json @@ -607,7 +607,8 @@ "kerberos_domain": "EXAMPLE.COM", "user_group": "hadoop", "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", - "kinit_path_local": "/usr/bin" + "kinit_path_local": "/usr/bin", + "ambari_principal_name": "ambari-server" }, "hadoop-env": { "namenode_opt_maxnewsize": "200m", http://git-wip-us.apache.org/repos/asf/ambari/blob/7a187186/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json index c90d5bb..daa9030 100644 --- a/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json +++ b/ambari-server/src/test/python/stacks/2.3/configs/storm_default_secure.json @@ -191,7 +191,8 @@ "kerberos_domain": "EXAMPLE.COM", "user_group": "hadoop", "smokeuser": "ambari-qa", - "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab" + "smokeuser_keytab": "/etc/security/keytabs/smokeuser.headless.keytab", + "ambari_principal_name": "ambari-server" } }, "configurationTags": {
