You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/06/08 16:31:25 UTC
ambari git commit: AMBARI-11752. Kerberos: adjust ambari headless
principals for unique names (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 590a2e249 -> ecb2b05e0
AMBARI-11752. Kerberos: adjust ambari headless principals for unique names (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ecb2b05e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ecb2b05e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ecb2b05e
Branch: refs/heads/trunk
Commit: ecb2b05e0ea9482245255ecd219ad95162495739
Parents: 590a2e2
Author: Robert Levas <rl...@hortonworks.com>
Authored: Mon Jun 8 10:31:24 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jun 8 10:31:28 2015 -0400
----------------------------------------------------------------------
.../state/kerberos/KerberosDescriptor.java | 5 ---
.../ACCUMULO/1.6.1.2.2.0/kerberos.json | 2 +-
.../HBASE/0.96.0.2.0/kerberos.json | 2 +-
.../SPARK/1.2.0.2.2/kerberos.json | 2 +-
.../resources/stacks/HDP/2.0.6/kerberos.json | 4 +-
.../services/ACCUMULO/kerberos.json | 2 +-
.../HDP/2.3/services/ACCUMULO/kerberos.json | 4 +-
.../main/admin/kerberos/step4_controller.js | 4 +-
ambari-web/app/data/HDP2/site_properties.js | 42 ++++++++++++++++++++
9 files changed, 52 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java
index 8cd9718..1c44789 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/KerberosDescriptor.java
@@ -17,11 +17,6 @@
*/
package org.apache.ambari.server.state.kerberos;
-import org.apache.ambari.server.AmbariException;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
index 884bc56..48a1280 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
@@ -6,7 +6,7 @@
{
"name": "accumulo",
"principal": {
- "value": "${accumulo-env/accumulo_user}@${realm}",
+ "value": "${accumulo-env/accumulo_user}-${cluster_name}@${realm}",
"type" : "user",
"configuration": "accumulo-env/accumulo_principal_name",
"local_username": "${accumulo-env/accumulo_user}"
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
index 5da0846..e743428 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
@@ -12,7 +12,7 @@
{
"name": "hbase",
"principal": {
- "value": "${hbase-env/hbase_user}@${realm}",
+ "value": "${hbase-env/hbase_user}-${cluster_name}@${realm}",
"type" : "user",
"configuration": "hbase-env/hbase_principal_name",
"local_username": "${hbase-env/hbase_user}"
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/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 9a707dc..fb8b04a 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
@@ -12,7 +12,7 @@
{
"name": "sparkuser",
"principal": {
- "value": "${spark-env/spark_user}@${realm}",
+ "value": "${spark-env/spark_user}-${cluster_name}@${realm}",
"type" : "user",
"configuration": "spark-defaults/spark.history.kerberos.principal",
"local_username" : "${spark-env/spark_user}"
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
index 027c20b..015da1f 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
@@ -25,7 +25,7 @@
{
"name": "hdfs",
"principal": {
- "value": "${hadoop-env/hdfs_user}@${realm}",
+ "value": "${hadoop-env/hdfs_user}-${cluster_name}@${realm}",
"type" : "user" ,
"configuration": "hadoop-env/hdfs_principal_name",
"local_username" : "${hadoop-env/hdfs_user}"
@@ -46,7 +46,7 @@
{
"name": "smokeuser",
"principal": {
- "value": "${cluster-env/smokeuser}@${realm}",
+ "value": "${cluster-env/smokeuser}-${cluster_name}@${realm}",
"type" : "user",
"configuration": "cluster-env/smokeuser_principal_name",
"local_username" : "${cluster-env/smokeuser}"
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
index 3a3ecc3..f1939d6 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
@@ -6,7 +6,7 @@
{
"name": "accumulo",
"principal": {
- "value": "${accumulo-env/accumulo_user}@${realm}",
+ "value": "${accumulo-env/accumulo_user}-${cluster_name}@${realm}",
"type" : "user",
"configuration": "accumulo-env/accumulo_principal_name",
"local_username": "${accumulo-env/accumulo_user}"
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
index 8a3381a..82d8336 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
@@ -6,7 +6,7 @@
{
"name": "accumulo",
"principal": {
- "value": "${accumulo-env/accumulo_user}@${realm}",
+ "value": "${accumulo-env/accumulo_user}-${cluster_name}@${realm}",
"type" : "user",
"configuration": "accumulo-env/accumulo_principal_name",
"local_username": "${accumulo-env/accumulo_user}"
@@ -48,7 +48,7 @@
{
"name": "accumulo_tracer",
"principal": {
- "value": "tracer@${realm}",
+ "value": "tracer-${cluster_name}@${realm}",
"type" : "user",
"configuration": "accumulo-site/trace.user",
"local_username": "${accumulo-env/accumulo_user}"
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
index 74fc4ac..32f1601 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step4_controller.js
@@ -53,7 +53,7 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
// Identity configs related to user principal
var clusterConfigs = configs.filterProperty('serviceName','Cluster');
// storm user principal is not required for ambari operation
- var userConfigs = configs.filterProperty('identityType','user').rejectProperty('serviceName','STORM');
+ var userConfigs = configs.filterProperty('identityType','user');
var generalConfigs = clusterConfigs.concat(userConfigs).uniq('name');
var advancedConfigs = configs.filter(function(element){
return !generalConfigs.findProperty('name', element.get('name'));
@@ -183,7 +183,7 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
property.set('category', property.get('serviceName'));
}
// All user identity except storm should be grouped under "Ambari Principals" category
- if (property.get('identityType') == 'user' && property.get('serviceName') !== 'STORM') property.set('category', 'Ambari Principals');
+ if (property.get('identityType') == 'user') property.set('category', 'Ambari Principals');
var siteProperty = siteProperties.findProperty('name', property.get('name'));
if (siteProperty) {
if (siteProperty.category === property.get('category')) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecb2b05e/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 164cb00..484ad38 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -5096,6 +5096,48 @@ var hdp2properties = [
"category": "Ambari Principals",
"filename": "hbase-env.xml",
"index": 6
+ },
+ {
+ "name": "accumulo_principal_name",
+ "displayName": "Accumulo user principal",
+ "category": "Ambari Principals",
+ "filename": "accumulo-env.xml",
+ "index": 7
+ },
+ {
+ "name": "accumulo_user_keytab",
+ "displayName": "Accumulo user keytab",
+ "category": "Ambari Principals",
+ "filename": "accumulo-env.xml",
+ "index": 8
+ },
+ {
+ "name": "spark.history.kerberos.principal",
+ "displayName": "Spark user principal",
+ "category": "Ambari Principals",
+ "filename": "spark-env.xml",
+ "index": 9
+ },
+ {
+ "name": "spark.history.kerberos.keytab",
+ "displayName": "Spark user keytab",
+ "category": "Ambari Principals",
+ "filename": "spark-env.xml",
+ "index": 10
+ },
+ {
+ "name": "storm_principal_name",
+ "displayName": "Storm user principal",
+ "category": "Ambari Principals",
+ "filename": "storm-env.xml",
+ "index": 11
+ },
+ {
+ "name": "storm_keytab",
+ "displayName": "Storm user keytab",
+ "category": "Ambari Principals",
+ "filename": "storm-env.xml",
+ "index": 12
}
];