Repository: ambari Updated Branches: refs/heads/trunk e2220ea8a -> c4ca3b890
AMBARI-18892. Summary:storm DRPC_SERVER kerberos configs duplicate (Wang Yaoxin via rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4ca3b89 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4ca3b89 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4ca3b89 Branch: refs/heads/trunk Commit: c4ca3b8908c9b71a88de47400aebb874e66e17b6 Parents: e2220ea Author: Wang Yaoxin <[email protected]> Authored: Thu Mar 9 12:52:37 2017 -0500 Committer: Robert Levas <[email protected]> Committed: Thu Mar 9 12:58:10 2017 -0500 ---------------------------------------------------------------------- .../common-services/STORM/0.9.1/kerberos.json | 20 ++----------------- .../common-services/STORM/1.0.1/kerberos.json | 20 ++----------------- .../data/stacks/HDP-2.1/service_components.json | 21 ++------------------ 3 files changed, 6 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c4ca3b89/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json b/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json index 20cc32d..692b557 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json @@ -90,24 +90,8 @@ "name": "DRPC_SERVER", "identities": [ { - "name": "nimbus_server", - "principal": { - "value": "nimbus/_HOST@${realm}", - "type": "service", - "configuration": "storm-env/nimbus_principal_name" - }, - "keytab": { - "file": "${keytab_dir}/nimbus.service.keytab", - "owner": { - "name": "${storm-env/storm_user}", - "access": "r" - }, - "group": { - "name": "${cluster-env/user_group}", - "access": "" - }, - "configuration": "storm-env/nimbus_keytab" - } + "name": "drpc_server", + "reference": "/STORM/NIMBUS/nimbus_server" } ] }, http://git-wip-us.apache.org/repos/asf/ambari/blob/c4ca3b89/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 fa2f6db..a034411 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 @@ -120,24 +120,8 @@ "name": "DRPC_SERVER", "identities": [ { - "name": "nimbus_server", - "principal": { - "value": "nimbus/_HOST@${realm}", - "type": "service", - "configuration": "storm-env/nimbus_principal_name" - }, - "keytab": { - "file": "${keytab_dir}/nimbus.service.keytab", - "owner": { - "name": "${storm-env/storm_user}", - "access": "r" - }, - "group": { - "name": "${cluster-env/user_group}", - "access": "" - }, - "configuration": "storm-env/nimbus_keytab" - } + "name": "drpc_server", + "reference": "/STORM/NIMBUS/nimbus_server" } ] }, http://git-wip-us.apache.org/repos/asf/ambari/blob/c4ca3b89/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json ---------------------------------------------------------------------- diff --git a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json index 0a8f20b..7d0ced4 100644 --- a/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json +++ b/ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json @@ -2444,25 +2444,8 @@ { "identities" : [ { - "principal" : { - "configuration" : "storm-env/nimbus_principal_name", - "type" : "service", - "local_username" : null, - "value" : "nimbus/_HOST@${realm}" - }, - "name" : "nimbus_server", - "keytab" : { - "owner" : { - "access" : "r", - "name" : "${storm-env/storm_user}" - }, - "file" : "${keytab_dir}/nimbus.service.keytab", - "configuration" : "storm-env/nimbus_keytab", - "group" : { - "access" : "", - "name" : "${cluster-env/user_group}" - } - } + "name": "drpc_server", + "reference": "/STORM/NIMBUS/nimbus_server" } ], "name" : "DRPC_SERVER"
