Repository: ambari Updated Branches: refs/heads/branch-2.4 d286437da -> a3f27bdea
AMBARI-17861. Ambari principal should be part of nimbus.admins for Storm View - addendum (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/a3f27bde Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a3f27bde Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a3f27bde Branch: refs/heads/branch-2.4 Commit: a3f27bdea1b8c6e3f41ab14af257acfa43252005 Parents: d286437 Author: Sumit Mohanty <[email protected]> Authored: Sat Jul 23 16:08:12 2016 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Sat Jul 23 16:08:49 2016 -0700 ---------------------------------------------------------------------- .../STORM/0.9.1/package/scripts/params_linux.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a3f27bde/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 39c1f0a..c6da1c8 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 @@ -143,8 +143,7 @@ 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) + _ambari_principal_name = default('/configurations/cluster-env/ambari_principal_name', None) storm_keytab_path = config['configurations']['storm-env']['storm_keytab'] if stack_supports_storm_kerberos: @@ -152,7 +151,8 @@ 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) + if _ambari_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)
