You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ni...@apache.org on 2017/10/13 16:36:54 UTC

ambari git commit: AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51)

Repository: ambari
Updated Branches:
  refs/heads/trunk 20faae7a3 -> c8c1812b0


AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51)


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

Branch: refs/heads/trunk
Commit: c8c1812b07ba0f64093190519cf829df8ea639d0
Parents: 20faae7
Author: Nishant <ni...@gmail.com>
Authored: Fri Oct 13 22:06:41 2017 +0530
Committer: Nishant <ni...@gmail.com>
Committed: Fri Oct 13 22:06:41 2017 +0530

----------------------------------------------------------------------
 .../stacks/HDP/2.6/services/DRUID/kerberos.json | 45 ++++----------------
 .../HDP/2.6/services/SUPERSET/kerberos.json     | 10 +----
 2 files changed, 11 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c8c1812b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
index 198c351..f186e31 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json
@@ -16,7 +16,7 @@
         {
           "name": "druid",
           "principal": {
-            "value": "${druid-env/druid_user}@${realm}",
+            "value": "${druid-env/druid_user}${principal_suffix}@${realm}",
             "type": "user",
             "configuration": "druid-common/druid.hadoop.security.kerberos.principal",
             "local_username": "${druid-env/druid_user}"
@@ -41,49 +41,22 @@
       ],
       "components": [
         {
-          "name": "DRUID_HISTORICAL",
-          "identities": [
-            {
-              "name": "druid_druid_historical_druid",
-              "reference": "/druid"
-            }
-          ]
+          "name": "DRUID_HISTORICAL"
         },
         {
-          "name": "DRUID_BROKER",
-          "identities": [
-            {
-              "name": "druid_druid_broker_druid",
-              "reference": "/druid"
-            }
-          ]
+          "name": "DRUID_BROKER"
         },
         {
-          "name": "DRUID_OVERLORD",
-          "identities": [
-            {
-              "name": "druid_druid_historical_druid",
-              "reference": "/druid"
-            }
-          ]
+          "name": "DRUID_OVERLORD"
         },
         {
-          "name": "DRUID_COORDINATOR",
-          "identities": [
-            {
-              "name": "druid_druid_coordinator_druid",
-              "reference": "/druid"
-            }
-          ]
+          "name": "DRUID_COORDINATOR"
         },
         {
-          "name": "DRUID_MIDDLEMANAGER",
-          "identities": [
-            {
-              "name": "druid_druid_middlemanager_druid",
-              "reference": "/druid"
-            }
-          ]
+          "name": "DRUID_MIDDLEMANAGER"
+        },
+        {
+          "name": "DRUID_ROUTER"
         }
       ],
       "configurations": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/c8c1812b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
index 5d5125d..0de6737 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json
@@ -6,7 +6,7 @@
         {
           "name": "superset",
           "principal": {
-            "value": "${superset-env/superset_user}@${realm}",
+            "value": "${superset-env/superset_user}${principal_suffix}@${realm}",
             "type": "user",
             "configuration": "superset/KERBEROS_PRINCIPAL",
             "local_username": "${superset-env/superset_user}"
@@ -31,13 +31,7 @@
       ],
       "components": [
         {
-          "name": "SUPERSET",
-          "identities": [
-            {
-              "name": "superset_superset_superset",
-              "reference": "/superset"
-            }
-          ]
+          "name": "SUPERSET"
         }
       ],
       "configurations": [