You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/08/27 14:58:26 UTC

[1/2] ambari git commit: AMBARI-12901. Ambari Headless principal for Storm should include cluster-name (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 25ed4efcc -> 3d4cc38a6
  refs/heads/trunk 6e8d00cff -> e0a78028b


AMBARI-12901. Ambari Headless principal for Storm should include cluster-name (aonishuk)


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

Branch: refs/heads/trunk
Commit: e0a78028b4484b8238c58b8d8eef8054f604e654
Parents: 6e8d00c
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Aug 27 15:58:04 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Aug 27 15:58:04 2015 +0300

----------------------------------------------------------------------
 .../main/resources/common-services/STORM/0.9.1.2.1/kerberos.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e0a78028/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 c96d7e7..db21f51 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
@@ -40,8 +40,8 @@
             "supervisor.enable": "true",
             "storm.zookeeper.superACL": "sasl:{{storm_bare_jaas_principal}}",
             "java.security.auth.login.config": "{{conf_dir}}/storm_jaas.conf",
-            "nimbus.admins": "['{{storm_user}}']",
-            "nimbus.supervisor.users": "['{{storm_user}}']",
+            "nimbus.admins": "['{{storm_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'}"
           }
         }


[2/2] ambari git commit: AMBARI-12901. Ambari Headless principal for Storm should include cluster-name (aonishuk)

Posted by ao...@apache.org.
AMBARI-12901. Ambari Headless principal for Storm should include cluster-name (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 3d4cc38a646de6b70bbfadeabb0a512484286f89
Parents: 25ed4ef
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Aug 27 15:58:07 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Aug 27 15:58:07 2015 +0300

----------------------------------------------------------------------
 .../main/resources/common-services/STORM/0.9.1.2.1/kerberos.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d4cc38a/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 c96d7e7..db21f51 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
@@ -40,8 +40,8 @@
             "supervisor.enable": "true",
             "storm.zookeeper.superACL": "sasl:{{storm_bare_jaas_principal}}",
             "java.security.auth.login.config": "{{conf_dir}}/storm_jaas.conf",
-            "nimbus.admins": "['{{storm_user}}']",
-            "nimbus.supervisor.users": "['{{storm_user}}']",
+            "nimbus.admins": "['{{storm_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'}"
           }
         }