Repository: ambari
Updated Branches:
  refs/heads/trunk 94a4adc99 -> e9daaaa79


AMBARI-12343. Ambari storm deployment fails in secure mode due to storm 
principal name (rlevas)


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

Branch: refs/heads/trunk
Commit: e9daaaa79758dd01cff3fbca693f3db2405cd5e6
Parents: 94a4adc
Author: Robert Levas <rle...@hortonworks.com>
Authored: Thu Jul 9 11:00:41 2015 -0400
Committer: Robert Levas <rle...@hortonworks.com>
Committed: Thu Jul 9 11:00:52 2015 -0400

----------------------------------------------------------------------
 .../main/resources/common-services/STORM/0.9.1.2.1/kerberos.json   | 2 +-
 ambari-web/app/assets/data/stacks/HDP-2.1/service_components.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e9daaaa7/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 0f38600..c96d7e7 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,7 +12,7 @@
         {
           "name": "storm_components",
           "principal": {
-            "value": "storm-${cluster_name}@${realm}",
+            "value": "${storm-env/storm_user}@${realm}",
             "type": "user",
             "configuration": "storm-env/storm_principal_name"
           },

http://git-wip-us.apache.org/repos/asf/ambari/blob/e9daaaa7/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 ed8d624..ca9ac3c 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-${cluster_name}@${realm}"
+                "value" : "${storm-env/storm_user}@${realm}"
               },
               "name" : "storm_components",
               "keytab" : {

Reply via email to