ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rle...@apache.org
Subject ambari git commit: AMBARI-12137. Kerberos: storm headless princ + keytab seem incorrect (rlevas)
Date Thu, 25 Jun 2015 17:29:06 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 00da4de0f -> 1c0e7c530


AMBARI-12137. Kerberos: storm headless princ + keytab seem incorrect (rlevas)


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

Branch: refs/heads/trunk
Commit: 1c0e7c53090ec3fb1009f8ec1964367d2be35341
Parents: 00da4de
Author: Robert Levas <rlevas@hortonworks.com>
Authored: Thu Jun 25 13:29:00 2015 -0400
Committer: Robert Levas <rlevas@hortonworks.com>
Committed: Thu Jun 25 13:29:00 2015 -0400

----------------------------------------------------------------------
 .../main/resources/common-services/STORM/0.9.1.2.1/kerberos.json | 4 ++--
 .../src/test/python/stacks/2.1/configs/secured-storm-start.json  | 2 +-
 .../test/python/stacks/2.1/configs/secured-storm-start.json.orig | 2 +-
 .../src/test/python/stacks/2.3/configs/hbase_secure.json         | 2 +-
 .../src/test/python/stacks/2.3/configs/storm_default_secure.json | 2 +-
 .../app/assets/data/stacks/HDP-2.1/service_components.json       | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0e7c53/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
index 94eaae1..0f38600 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
@@ -12,12 +12,12 @@
         {
           "name": "storm_components",
           "principal": {
-            "value": "storm@${realm}",
+            "value": "storm-${cluster_name}@${realm}",
             "type": "user",
             "configuration": "storm-env/storm_principal_name"
           },
           "keytab": {
-            "file": "${keytab_dir}/storm.service.keytab",
+            "file": "${keytab_dir}/storm.headless.keytab",
             "owner": {
               "name": "${storm-env/storm_user}",
               "access": "r"

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0e7c53/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 b1022c3..0b1ea9e 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
@@ -223,7 +223,7 @@
             "nimbus_principal_name": "nimbus/_HOST@EXAMPLE.COM", 
             "storm_ui_keytab": "/etc/security/keytabs/http.storm.service.keytab",
             "nimbus_keytab": "/etc/security/keytabs/nimbus.service.keytab", 
-            "storm_keytab": "/etc/security/keytabs/storm.service.keytab", 
+            "storm_keytab": "/etc/security/keytabs/storm.headless.keytab",
             "storm_ui_principal_name": "HTTP/_HOST",
             "nimbus_seeds_supported" : false
         },

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0e7c53/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json.orig
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json.orig
b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json.orig
index 29b9c83..118520d 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json.orig
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured-storm-start.json.orig
@@ -221,7 +221,7 @@
             "nimbus_principal_name": "nimbus/_HOST@EXAMPLE.COM", 
             "storm_ui_keytab": "/etc/security/keytabs/http.storm.service.keytab",
             "nimbus_keytab": "/etc/security/keytabs/nimbus.service.keytab", 
-            "storm_keytab": "/etc/security/keytabs/storm.service.keytab", 
+            "storm_keytab": "/etc/security/keytabs/storm.headless.keytab",
             "storm_ui_principal_name": "HTTP/_HOST"
         }, 
         "core-site": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0e7c53/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
index 39f91c0..19e68d9 100644
--- a/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
+++ b/ambari-server/src/test/python/stacks/2.3/configs/hbase_secure.json
@@ -324,7 +324,7 @@
             "nimbus_principal_name": "nimbus/_HOST@EXAMPLE.COM", 
             "nimbus_keytab": "/etc/security/keytabs/nimbus.service.keytab", 
             "content": "\n#!/bin/bash\n\n# Set Storm specific environment variables here.\n\n#
The java implementation to use.\nexport JAVA_HOME={{java64_home}}\n\n# export STORM_CONF_DIR=\"\"\nexport
STORM_HOME=/usr/hdp/current/storm-client", 
-            "storm_keytab": "/etc/security/keytabs/storm.service.keytab", 
+            "storm_keytab": "/etc/security/keytabs/storm.headless.keytab",
             "storm_user": "storm"
         }, 
         "hbase-site": {

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0e7c53/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 3ae6941..85eb484 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
@@ -157,7 +157,7 @@
             "nimbus_keytab" : "/etc/security/keytabs/nimbus.service.keytab",
             "nimbus_principal_name" : "nimbus/_HOST@EXAMPLE.COM",
             "nimbus_seeds_supported" : "true",
-            "storm_keytab" : "/etc/security/keytabs/storm.service.keytab",
+            "storm_keytab" : "/etc/security/keytabs/storm.headless.keytab",
             "storm_log_dir" : "/var/log/storm",
             "storm_pid_dir" : "/var/run/storm",
             "storm_principal_name" : "storm@EXAMPLE.COM",

http://git-wip-us.apache.org/repos/asf/ambari/blob/1c0e7c53/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 75eef5e..ed8d624 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
@@ -2492,7 +2492,7 @@
                 "configuration" : "storm-env/storm_principal_name",
                 "type" : "user",
                 "local_username" : null,
-                "value" : "storm@${realm}"
+                "value" : "storm-${cluster_name}@${realm}"
               },
               "name" : "storm_components",
               "keytab" : {
@@ -2500,7 +2500,7 @@
                   "access" : "r",
                   "name" : "${storm-env/storm_user}"
                 },
-                "file" : "${keytab_dir}/storm.service.keytab",
+                "file" : "${keytab_dir}/storm.headless.keytab",
                 "configuration" : "storm-env/storm_keytab",
                 "group" : {
                   "access" : "",


Mime
View raw message