You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/03/06 18:51:34 UTC

ambari git commit: AMBARI-9952. Populate spark keytab to both spark_history_server and spark_client (Zhan Zhang via smohanty)

Repository: ambari
Updated Branches:
  refs/heads/trunk ee6754a72 -> 813973a05


AMBARI-9952. Populate spark keytab to both spark_history_server and spark_client (Zhan Zhang via smohanty)


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

Branch: refs/heads/trunk
Commit: 813973a051329b721b3f60cbd836ec58f631f4fb
Parents: ee6754a
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Fri Mar 6 09:51:04 2015 -0800
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Fri Mar 6 09:51:04 2015 -0800

----------------------------------------------------------------------
 .../SPARK/1.2.0.2.2/kerberos.json               | 52 +++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/813973a0/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
index 499d0dd..9a707dc 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
@@ -5,34 +5,38 @@
       "identities": [
         {
           "name": "/smokeuser"
+        },
+        {
+          "name": "/hdfs"
+        },
+        {
+          "name": "sparkuser",
+          "principal": {
+            "value": "${spark-env/spark_user}@${realm}",
+            "type" : "user",
+            "configuration": "spark-defaults/spark.history.kerberos.principal",
+            "local_username" : "${spark-env/spark_user}"
+          },
+          "keytab": {
+            "file": "${keytab_dir}/spark.headless.keytab",
+            "owner": {
+              "name": "${spark-env/spark_user}",
+              "access": "r"
+            },
+            "group": {
+              "name": "${cluster-env/user_group}",
+               "access": ""
+            },
+            "configuration": "spark-defaults/spark.history.kerberos.keytab"
+           }
         }
       ],
       "components": [
         {
-          "name": "SPARK_JOBHISTORYSERVER",
-          "identities": [
-            {
-              "name": "spark_historyserver",
-              "principal": {
-                "value": "spark/_HOST@${realm}",
-                "type" : "service",
-                "configuration": "spark-defaults/spark.history.kerberos.principal",
-                "local_username" : "${spark-env/spark_user}"
-              },
-              "keytab": {
-                "file": "${keytab_dir}/spark.service.keytab",
-                "owner": {
-                  "name": "${spark-env/spark_user}",
-                  "access": "r"
-                },
-                "group": {
-                  "name": "${cluster-env/user_group}",
-                  "access": ""
-                },
-                "configuration": "spark-defaults/spark.history.kerberos.keytab"
-              }
-            }
-          ]
+          "name": "SPARK_JOBHISTORYSERVER"
+        },
+        {
+          "name": "SPARK_CLIENT"
         }
       ]
     }