AMBARI-18923. Keytab settings in kerberos.json for SPARK are at the wrong place. (Attila Magyar via stoader)

ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json

@@ -26,36 +26,6 @@
             },
             "configuration": "spark-defaults/spark.history.kerberos.keytab"
            }
-        },
-        {
-          "name": "livyuser",
-          "principal": {
-            "value": "${livy-env/livy_user}/_HOST@${realm}",
-            "type" : "service",
-            "configuration": "livy-conf/livy.server.kerberos.principal",
-            "local_username": "${livy-env/livy_user}"
-          },
-          "keytab": {
-            "file": "${keytab_dir}/livy.service.keytab",
-            "owner": {
-              "name": "${livy-env/livy_user}",
-              "access": "r"
-            },
-            "group": {
-              "name": "${cluster-env/user_group}",
-              "access": ""
-            },
-            "configuration": "livy-conf/livy.server.kerberos.keytab"
-          }
-        },
-        {
-          "name": "/spnego",
-          "principal": {
-            "configuration": "livy-conf/livy.server.auth.kerberos.principal"
-          },
-          "keytab": {
-            "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
-          }
         }
       ],
       "configurations": [
@@ -112,6 +82,36 @@
           "identities": [
             {
               "name": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "livyuser",
+              "principal": {
+                "value": "${livy-env/livy_user}/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "livy-conf/livy.server.kerberos.principal",
+                "local_username": "${livy-env/livy_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/livy.service.keytab",
+                "owner": {
+                  "name": "${livy-env/livy_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "livy-conf/livy.server.kerberos.keytab"
+              }
+            },
+            {
+              "name": "/spnego",
+              "principal": {
+                "configuration": "livy-conf/livy.server.auth.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
+              }
             }
           ]
         }

ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json

@@ -26,37 +26,6 @@
             },
             "configuration": "spark-defaults/spark.history.kerberos.keytab"
            }
-        },
-        {
-          "name": "livyuser",
-          "principal": {
-            "value": "${livy-env/livy_user}/_HOST@${realm}",
-            "type" : "service",
-            "configuration": "livy-conf/livy.server.launch.kerberos.principal",
-            "local_username": "${livy-env/livy_user}"
-          },
-          "keytab": {
-            "file": "${keytab_dir}/livy.service.keytab",
-            "owner": {
-              "name": "${livy-env/livy_user}",
-              "access": "r"
-            },
-            "group": {
-              "name": "${cluster-env/user_group}",
-              "access": ""
-            },
-            "configuration": "livy-conf/livy.server.launch.kerberos.keytab"
-          }
-        },
-        {
-          "name": "livy_spnego",
-          "reference": "/spnego",
-          "principal": {
-            "configuration": "livy-conf/livy.server.auth.kerberos.principal"
-          },
-          "keytab": {
-            "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
-          }
         }
       ],
       "configurations": [
@@ -117,6 +86,37 @@
             {
               "name": "hdfs",
               "reference": "/HDFS/NAMENODE/hdfs"
+            },
+            {
+              "name": "livyuser",
+              "principal": {
+                "value": "${livy-env/livy_user}/_HOST@${realm}",
+                "type" : "service",
+                "configuration": "livy-conf/livy.server.launch.kerberos.principal",
+                "local_username": "${livy-env/livy_user}"
+              },
+              "keytab": {
+                "file": "${keytab_dir}/livy.service.keytab",
+                "owner": {
+                  "name": "${livy-env/livy_user}",
+                  "access": "r"
+                },
+                "group": {
+                  "name": "${cluster-env/user_group}",
+                  "access": ""
+                },
+                "configuration": "livy-conf/livy.server.launch.kerberos.keytab"
+              }
+            },
+            {
+              "name": "livy_spnego",
+              "reference": "/spnego",
+              "principal": {
+                "configuration": "livy-conf/livy.server.auth.kerberos.principal"
+              },
+              "keytab": {
+                "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
+              }
             }
           ]
         }