Repository: ambari Updated Branches: refs/heads/trunk f83881b45 -> 87eef6e97
AMBARI-19430. Use common property for principal name prefix to help with customization of unique principal names (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87eef6e9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87eef6e9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87eef6e9 Branch: refs/heads/trunk Commit: 87eef6e97cd3e39f928bf99cdd00079e2c89c6d6 Parents: f83881b Author: Robert Levas <[email protected]> Authored: Mon Jan 16 12:21:46 2017 -0500 Committer: Robert Levas <[email protected]> Committed: Thu Jan 19 05:04:24 2017 -0500 ---------------------------------------------------------------------- .../HDP/2.0.8/services/HDFS/kerberos.json | 2 +- .../ACCUMULO/1.6.1.2.2.0/kerberos.json | 2 +- .../HBASE/0.96.0.2.0/kerberos.json | 2 +- .../HDFS/2.1.0.2.0/kerberos.json | 2 +- .../HDFS/3.0.0.3.0/kerberos.json | 2 +- .../common-services/SPARK/1.2.1/kerberos.json | 2 +- .../common-services/SPARK/1.4.1/kerberos.json | 2 +- .../common-services/SPARK2/2.0.0/kerberos.json | 2 +- .../common-services/STORM/0.9.1/kerberos.json | 2 +- .../common-services/STORM/1.0.1/kerberos.json | 2 +- .../ZEPPELIN/0.6.0.2.5/kerberos.json | 2 +- .../resources/stacks/HDP/2.0.6/kerberos.json | 7 ++++--- .../HDP/2.3.ECS/services/ECS/kerberos.json | 2 +- .../HDP/2.3.ECS/services/HBASE/kerberos.json | 2 +- .../services/ACCUMULO/kerberos.json | 2 +- .../HDP/2.3/services/ACCUMULO/kerberos.json | 4 ++-- .../stacks/HDP/2.5/services/HBASE/kerberos.json | 2 +- .../stacks/HDP/2.5/services/HDFS/kerberos.json | 2 +- .../stacks/HDP/2.5/services/SPARK/kerberos.json | 4 ++-- .../stacks/HDP/2.6/services/SPARK/kerberos.json | 4 ++-- .../HDP/2.6/services/SPARK2/kerberos.json | 4 ++-- .../main/resources/stacks/HDP/3.0/kerberos.json | 7 ++++--- .../resources/stacks/PERF/1.0/kerberos.json | 7 ++++--- .../PERF/1.0/services/GRUMPY/kerberos.json | 2 +- .../PERF/1.0/services/HAPPY/kerberos.json | 2 +- .../PERF/1.0/services/HBASE/kerberos.json | 2 +- .../stacks/PERF/1.0/services/HDFS/kerberos.json | 2 +- .../PERF/1.0/services/SLEEPY/kerberos.json | 2 +- .../stacks/PERF/1.0/services/SNOW/kerberos.json | 2 +- .../server/controller/KerberosHelperTest.java | 7 ++++--- .../KerberosDescriptorUpdateHelperTest.java | 22 ++++++++++---------- .../test_kerberos_descriptor_2_1_3.json | 14 ++++++------- .../test_kerberos_descriptor_no_hdfs.json | 4 ++-- .../test_kerberos_descriptor_simple.json | 4 ++-- .../HDP/2.0.8/services/HDFS/kerberos.json | 2 +- ambari-web/test/utils/config_test.js | 2 +- ambari-web/test/utils/object_utils_test.js | 2 +- .../main/resources/stacks/HDF/2.0/kerberos.json | 7 ++++--- 38 files changed, 75 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-funtest/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-funtest/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json b/ambari-funtest/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json index d53205d..a555bb5 100644 --- a/ambari-funtest/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json +++ b/ambari-funtest/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json @@ -18,7 +18,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}", "type" : "user" , "configuration": "hadoop-env/hdfs_principal_name", "local_username" : "${hadoop-env/hdfs_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/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 caef123..7e3f449 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}-${cluster_name|toLower()}@${realm}", + "value": "${accumulo-env/accumulo_user}${principal_suffix}@${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/87eef6e9/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 636d36e..63e9298 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 @@ -9,7 +9,7 @@ { "name": "hbase", "principal": { - "value": "${hbase-env/hbase_user}-${cluster_name|toLower()}@${realm}", + "value": "${hbase-env/hbase_user}${principal_suffix}@${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/87eef6e9/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json index f30c9e4..1cf1603 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json @@ -43,7 +43,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}", "type" : "user" , "configuration": "hadoop-env/hdfs_principal_name", "local_username" : "${hadoop-env/hdfs_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/kerberos.json b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/kerberos.json index 1dd801b..4fdffcf 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/kerberos.json +++ b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/kerberos.json @@ -53,7 +53,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}", "type" : "user" , "configuration": "hadoop-env/hdfs_principal_name", "local_username" : "${hadoop-env/hdfs_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/common-services/SPARK/1.2.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/kerberos.json b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/kerberos.json index fa6af33..96df126 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/kerberos.json +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/kerberos.json @@ -9,7 +9,7 @@ { "name": "sparkuser", "principal": { - "value": "${spark-env/spark_user}-${cluster_name|toLower()}@${realm}", + "value": "${spark-env/spark_user}${principal_suffix}@${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/87eef6e9/ambari-server/src/main/resources/common-services/SPARK/1.4.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.4.1/kerberos.json b/ambari-server/src/main/resources/common-services/SPARK/1.4.1/kerberos.json index e7f78cd..fb43657 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.4.1/kerberos.json +++ b/ambari-server/src/main/resources/common-services/SPARK/1.4.1/kerberos.json @@ -9,7 +9,7 @@ { "name": "sparkuser", "principal": { - "value": "${spark-env/spark_user}-${cluster_name|toLower()}@${realm}", + "value": "${spark-env/spark_user}${principal_suffix}@${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/87eef6e9/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json index 20e1dc0..cf7eeba 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/kerberos.json @@ -9,7 +9,7 @@ { "name": "spark2user", "principal": { - "value": "${spark2-env/spark_user}-${cluster_name|toLower()}@${realm}", + "value": "${spark2-env/spark_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "spark2-defaults/spark.history.kerberos.principal", "local_username" : "${spark2-env/spark_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json b/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json index fcfe524..20cc32d 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/kerberos.json @@ -12,7 +12,7 @@ { "name": "storm_components", "principal": { - "value": "${storm-env/storm_user}-${cluster_name|toLower()}@${realm}", + "value": "${storm-env/storm_user}${principal_suffix}@${realm}", "type": "user", "configuration": "storm-env/storm_principal_name" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json index 3068226..fecef7c 100644 --- a/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json +++ b/ambari-server/src/main/resources/common-services/STORM/1.0.1/kerberos.json @@ -12,7 +12,7 @@ { "name": "storm_components", "principal": { - "value": "${storm-env/storm_user}-${cluster_name|toLower()}@${realm}", + "value": "${storm-env/storm_user}${principal_suffix}@${realm}", "type": "user", "configuration": "storm-env/storm_principal_name" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/kerberos.json b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/kerberos.json index 7c4c04c..5625681 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/kerberos.json +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/kerberos.json @@ -9,7 +9,7 @@ { "name": "zeppelin_user", "principal": { - "value": "${zeppelin-env/zeppelin_user}-${cluster_name|toLower()}@${realm}", + "value": "${zeppelin-env/zeppelin_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "zeppelin-env/zeppelin.server.kerberos.principal", "local_username" : "${zeppelin-env/zeppelin_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/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 9579d0f..3787db1 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 @@ -2,7 +2,8 @@ "properties": { "realm": "${kerberos-env/realm}", "keytab_dir": "/etc/security/keytabs", - "additional_realms": "" + "additional_realms": "", + "principal_suffix": "-${cluster_name|toLower()}" }, "identities": [ { @@ -26,7 +27,7 @@ { "name": "smokeuser", "principal": { - "value": "${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}", + "value": "${cluster-env/smokeuser}${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/smokeuser_principal_name", "local_username": "${cluster-env/smokeuser}" @@ -55,7 +56,7 @@ { "name": "ambari-server", "principal": { - "value": "ambari-server-${cluster_name|toLower()}@${realm}", + "value": "ambari-server${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/ambari_principal_name" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/kerberos.json index 9668354..3e8451d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/ECS/kerberos.json @@ -9,7 +9,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}", "type" : "user" , "configuration": "hadoop-env/hdfs_principal_name", "local_username" : "${hadoop-env/hdfs_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/kerberos.json index 20b10f7..5dfcb5e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.3.ECS/services/HBASE/kerberos.json @@ -12,7 +12,7 @@ { "name": "hbase", "principal": { - "value": "${hbase-env/hbase_user}-${cluster_name|toLower()}@${realm}", + "value": "${hbase-env/hbase_user}${principal_suffix}@${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/87eef6e9/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 678a2b5..04ef946 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}-${cluster_name|toLower()}@${realm}", + "value": "${accumulo-env/accumulo_user}${principal_suffix}@${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/87eef6e9/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 0fec0ab..cbfac42 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}-${cluster_name|toLower()}@${realm}", + "value": "${accumulo-env/accumulo_user}${principal_suffix}@${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-${cluster_name|toLower()}@${realm}", + "value": "tracer${principal_suffix}@${realm}", "type" : "user", "configuration": "accumulo-site/trace.user", "local_username": "${accumulo-env/accumulo_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/kerberos.json index 9ed40ef..f510770 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HBASE/kerberos.json @@ -9,7 +9,7 @@ { "name": "hbase", "principal": { - "value": "${hbase-env/hbase_user}-${cluster_name|toLower()}@${realm}", + "value": "${hbase-env/hbase_user}${principal_suffix}@${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/87eef6e9/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json index 9000e95..766a014 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/HDFS/kerberos.json @@ -53,7 +53,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}", "type" : "user" , "configuration": "hadoop-env/hdfs_principal_name", "local_username" : "${hadoop-env/hdfs_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json index bd6c6c1..aa81edb 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json @@ -9,7 +9,7 @@ { "name": "sparkuser", "principal": { - "value": "${spark-env/spark_user}-${cluster_name|toLower()}@${realm}", + "value": "${spark-env/spark_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "spark-defaults/spark.history.kerberos.principal", "local_username" : "${spark-env/spark_user}" @@ -44,7 +44,7 @@ "livy-conf": { "livy.server.auth.type": "kerberos", "livy.impersonation.enabled": "true", - "livy.superusers": "zeppelin-${cluster_name}" + "livy.superusers": "zeppelin${principal_suffix}" } }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json index ae0d631..872f78b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json @@ -9,7 +9,7 @@ { "name": "sparkuser", "principal": { - "value": "${spark-env/spark_user}-${cluster_name|toLower()}@${realm}", + "value": "${spark-env/spark_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "spark-defaults/spark.history.kerberos.principal", "local_username" : "${spark-env/spark_user}" @@ -44,7 +44,7 @@ "livy-conf": { "livy.server.auth.type": "kerberos", "livy.impersonation.enabled": "true", - "livy.superusers": "zeppelin-${cluster_name}" + "livy.superusers": "zeppelin${principal_suffix}" } }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json index a16e2e1..6b5b053 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/kerberos.json @@ -9,7 +9,7 @@ { "name": "spark2user", "principal": { - "value": "${spark2-env/spark_user}-${cluster_name|toLower()}@${realm}", + "value": "${spark2-env/spark_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "spark2-defaults/spark.history.kerberos.principal", "local_username" : "${spark2-env/spark_user}" @@ -44,7 +44,7 @@ "livy2-conf": { "livy.server.auth.type": "kerberos", "livy.impersonation.enabled": "true", - "livy.superusers": "zeppelin-${cluster_name}" + "livy.superusers": "zeppelin${principal_suffix}" } }, { http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/HDP/3.0/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/3.0/kerberos.json index 9579d0f..3787db1 100644 --- a/ambari-server/src/main/resources/stacks/HDP/3.0/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/3.0/kerberos.json @@ -2,7 +2,8 @@ "properties": { "realm": "${kerberos-env/realm}", "keytab_dir": "/etc/security/keytabs", - "additional_realms": "" + "additional_realms": "", + "principal_suffix": "-${cluster_name|toLower()}" }, "identities": [ { @@ -26,7 +27,7 @@ { "name": "smokeuser", "principal": { - "value": "${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}", + "value": "${cluster-env/smokeuser}${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/smokeuser_principal_name", "local_username": "${cluster-env/smokeuser}" @@ -55,7 +56,7 @@ { "name": "ambari-server", "principal": { - "value": "ambari-server-${cluster_name|toLower()}@${realm}", + "value": "ambari-server${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/ambari_principal_name" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/PERF/1.0/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/kerberos.json b/ambari-server/src/main/resources/stacks/PERF/1.0/kerberos.json index a2a667b..9228c56 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/kerberos.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/kerberos.json @@ -2,7 +2,8 @@ "properties": { "realm": "${kerberos-env/realm}", "keytab_dir": "/home/_HOST/etc/security/keytabs", - "additional_realms": "" + "additional_realms": "", + "principal_suffix": "-${cluster_name|toLower()}" }, "identities": [ { @@ -26,7 +27,7 @@ { "name": "smokeuser", "principal": { - "value": "${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}", + "value": "${cluster-env/smokeuser}${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/smokeuser_principal_name", "local_username": "${cluster-env/smokeuser}" @@ -55,7 +56,7 @@ { "name": "ambari-server", "principal": { - "value": "ambari-server-${cluster_name|toLower()}@${realm}", + "value": "ambari-server${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/ambari_principal_name" }, http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/kerberos.json b/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/kerberos.json index 3bf5fbd..58dbce0 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/kerberos.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/GRUMPY/kerberos.json @@ -9,7 +9,7 @@ { "name": "grumpy", "principal": { - "value": "${grumpy-site/grumpy_user}-${cluster_name|toLower()}@${realm}", + "value": "${grumpy-site/grumpy_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "grumpy-site/grumpy_principal_name", "local_username": "${grumpy-site/grumpy_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/kerberos.json b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/kerberos.json index ae84eaf..cf14602 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/kerberos.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HAPPY/kerberos.json @@ -9,7 +9,7 @@ { "name": "happy", "principal": { - "value": "${happy-site/happy_user}-${cluster_name|toLower()}@${realm}", + "value": "${happy-site/happy_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "happy-site/happy_principal_name", "local_username": "${happy-site/happy_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/PERF/1.0/services/HBASE/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HBASE/kerberos.json b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HBASE/kerberos.json index 9ed40ef..f510770 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HBASE/kerberos.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HBASE/kerberos.json @@ -9,7 +9,7 @@ { "name": "hbase", "principal": { - "value": "${hbase-env/hbase_user}-${cluster_name|toLower()}@${realm}", + "value": "${hbase-env/hbase_user}${principal_suffix}@${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/87eef6e9/ambari-server/src/main/resources/stacks/PERF/1.0/services/HDFS/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HDFS/kerberos.json b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HDFS/kerberos.json index 974a69c..826d019 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/HDFS/kerberos.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/HDFS/kerberos.json @@ -53,7 +53,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}", "type" : "user" , "configuration": "hadoop-env/hdfs_principal_name", "local_username" : "${hadoop-env/hdfs_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/PERF/1.0/services/SLEEPY/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/SLEEPY/kerberos.json b/ambari-server/src/main/resources/stacks/PERF/1.0/services/SLEEPY/kerberos.json index 45e33f5..f0bf38c 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/SLEEPY/kerberos.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/SLEEPY/kerberos.json @@ -9,7 +9,7 @@ { "name": "sleepy", "principal": { - "value": "${sleepy-site/sleepy_user}-${cluster_name|toLower()}@${realm}", + "value": "${sleepy-site/sleepy_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "sleepy-site/sleepy_principal_name", "local_username": "${sleepy-site/sleepy_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/main/resources/stacks/PERF/1.0/services/SNOW/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/SNOW/kerberos.json b/ambari-server/src/main/resources/stacks/PERF/1.0/services/SNOW/kerberos.json index 47a979a8..6ee0af6 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/SNOW/kerberos.json +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/SNOW/kerberos.json @@ -9,7 +9,7 @@ { "name": "snow", "principal": { - "value": "${snow-site/snow_user}-${cluster_name|toLower()}@${realm}", + "value": "${snow-site/snow_user}${principal_suffix}@${realm}", "type" : "user", "configuration": "snow-site/snow_principal_name", "local_username": "${snow-site/snow_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java index 91cd608..9693f98 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java @@ -2485,12 +2485,12 @@ public class KerberosHelperTest extends EasyMockSupport { String ambariServerPrincipalNameExpected; if(ambariServerPrincipalAsService) { - ambariServerPrincipalName = "ambari-server-${cluster_name}/_HOST@${realm}"; + ambariServerPrincipalName = "ambari-server${principal_suffix}/_HOST@${realm}"; ambariServerPrincipalType = KerberosPrincipalType.SERVICE; ambariServerPrincipalNameExpected = String.format("ambari-server-%s/%s@%s", clusterName, ambariServerHostname, realm); } else { - ambariServerPrincipalName = "ambari-server-${cluster_name}@${realm}"; + ambariServerPrincipalName = "ambari-server${principal_suffix}@${realm}"; ambariServerPrincipalType = KerberosPrincipalType.USER; ambariServerPrincipalNameExpected = String.format("ambari-server-%s@%s", clusterName, realm); } @@ -2544,6 +2544,7 @@ public class KerberosHelperTest extends EasyMockSupport { kerberosDescriptorProperties.put("additional_realms", ""); kerberosDescriptorProperties.put("keytab_dir", "/etc/security/keytabs"); kerberosDescriptorProperties.put("realm", "${kerberos-env/realm}"); + kerberosDescriptorProperties.put("principal_suffix", "-${cluster_name|toLower()}"); ArrayList<KerberosIdentityDescriptor> service1Component1Identities = new ArrayList<KerberosIdentityDescriptor>(); service1Component1Identities.add(createMockIdentityDescriptor( @@ -3897,7 +3898,7 @@ public class KerberosHelperTest extends EasyMockSupport { KerberosDescriptor kerberosDescriptor = createMock(KerberosDescriptor.class); if (createAmbariIdentities) { - String ambariServerPrincipalName = "ambari-server-${cluster_name}@${realm}"; + String ambariServerPrincipalName = "ambari-server${principal_suffix}@${realm}"; KerberosPrincipalType ambariServerPrincipalType = KerberosPrincipalType.USER; String ambariServerKeytabFilePath = new File("ambari.server.keytab").getAbsolutePath(); http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java index 5c2e74e..247d17e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/kerberos/KerberosDescriptorUpdateHelperTest.java @@ -209,7 +209,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " {" + " \"name\": \"old_identity\"," + " \"principal\": {" + - " \"value\": \"foobar-${cluster_name|toLower()}@${realm}\"," + + " \"value\": \"foobar${principal_suffix}@${realm}\"," + " \"type\": \"user\"," + " \"configuration\": \"cluster-env/ambari_principal_name\"" + " }," + @@ -244,7 +244,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " {" + " \"name\": \"smokeuser\"," + " \"principal\": {" + - " \"value\": \"${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}\"," + + " \"value\": \"${cluster-env/smokeuser}${principal_suffix}@${realm}\"," + " \"type\": \"user\"," + " \"configuration\": \"cluster-env/smokeuser_principal_name\"," + " \"local_username\": \"${cluster-env/smokeuser}\"" + @@ -265,7 +265,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " {" + " \"name\": \"ambari-server\"," + " \"principal\": {" + - " \"value\": \"ambari-server-${cluster_name|toLower()}@${realm}\"," + + " \"value\": \"ambari-server${principal_suffix}@${realm}\"," + " \"type\": \"user\"," + " \"configuration\": \"cluster-env/ambari_principal_name\"" + " }," + @@ -321,7 +321,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " {" + " \"name\": \"old_identity\"," + " \"principal\": {" + - " \"value\": \"foobar-${cluster_name|toLower()}@${realm}\"," + + " \"value\": \"foobar${principal_suffix}@${realm}\"," + " \"type\": \"user\"," + " \"configuration\": \"cluster-env/ambari_principal_name\"" + " }," + @@ -363,7 +363,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " {\n" + " \"name\": \"smokeuser\",\n" + " \"principal\": {\n" + - " \"value\": \"${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}\",\n" + + " \"value\": \"${cluster-env/smokeuser}${principal_suffix}@${realm}\",\n" + " \"local_username\": \"${cluster-env/smokeuser}\",\n" + " \"configuration\": \"cluster-env/smokeuser_principal_name\",\n" + " \"type\": \"user\"\n" + @@ -396,7 +396,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " {\n" + " \"name\": \"ambari-server\",\n" + " \"principal\": {\n" + - " \"value\": \"ambari-server-${cluster_name|toLower()}@${realm}\",\n" + + " \"value\": \"ambari-server${principal_suffix}@${realm}\",\n" + " \"configuration\": \"cluster-env/ambari_principal_name\",\n" + " \"type\": \"user\"\n" + " },\n" + @@ -425,7 +425,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " {\n" + " \"name\": \"smokeuser\",\n" + " \"principal\": {\n" + - " \"value\": \"${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}\",\n" + + " \"value\": \"${cluster-env/smokeuser}${principal_suffix}@${realm}\",\n" + " \"local_username\": \"${cluster-env/smokeuser}\",\n" + " \"configuration\": \"cluster-env/smokeuser_principal_name\",\n" + " \"type\": \"user\"\n" + @@ -752,7 +752,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " \"configuration\": \"hadoop-env/hdfs_principal_name\",\n" + " \"type\": \"user\",\n" + " \"local_username\": \"${hadoop-env/hdfs_user}\",\n" + - " \"value\": \"${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}\"\n" + + " \"value\": \"${hadoop-env/hdfs_user}${principal_suffix}@${realm}\"\n" + " },\n" + " \"name\": \"hdfs\",\n" + " \"keytab\": {\n" + @@ -1254,7 +1254,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " \"configuration\": \"hadoop-env/hdfs_principal_name\",\n" + " \"type\": \"user\",\n" + " \"local_username\": \"${hadoop-env/hdfs_user}\",\n" + - " \"value\": \"${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}\"\n" + + " \"value\": \"${hadoop-env/hdfs_user}${principal_suffix}@${realm}\"\n" + " },\n" + " \"name\": \"hdfs\",\n" + " \"keytab\": {\n" + @@ -1677,7 +1677,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " \"configuration\": \"hadoop-env/hdfs_principal_name\",\n" + " \"type\": \"user\",\n" + " \"local_username\": \"${hadoop-env/hdfs_user}\",\n" + - " \"value\": \"${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}\"\n" + + " \"value\": \"${hadoop-env/hdfs_user}${principal_suffix}@${realm}\"\n" + " },\n" + " \"name\": \"hdfs\",\n" + " \"keytab\": {\n" + @@ -2078,7 +2078,7 @@ public class KerberosDescriptorUpdateHelperTest extends EasyMockSupport { " \"configuration\": \"hadoop-env/hdfs_principal_name\",\n" + " \"type\": \"user\",\n" + " \"local_username\": \"${hadoop-env/hdfs_user}\",\n" + - " \"value\": \"${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}\"\n" + + " \"value\": \"${hadoop-env/hdfs_user}${principal_suffix}@${realm}\"\n" + " },\n" + " \"name\": \"hdfs\",\n" + " \"keytab\": {\n" + http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json index 3d0dc28..271e3cf 100644 --- a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json +++ b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_2_1_3.json @@ -21,7 +21,7 @@ "configuration": "cluster-env/smokeuser_principal_name", "type": "user", "local_username": "${cluster-env/smokeuser}", - "value": "${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}" + "value": "${cluster-env/smokeuser}${principal_suffix}@${realm}" }, "name": "smokeuser", "keytab": { @@ -318,7 +318,7 @@ "configuration": "hadoop-env/hdfs_principal_name", "type": "user", "local_username": "${hadoop-env/hdfs_user}", - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}" + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}" }, "name": "hdfs", "keytab": { @@ -370,7 +370,7 @@ "configuration": "spark-defaults/spark.history.kerberos.principal", "type": "user", "local_username": "${spark-env/spark_user}", - "value": "${spark-env/spark_user}-${cluster_name|toLower()}@${realm}" + "value": "${spark-env/spark_user}${principal_suffix}@${realm}" }, "name": "sparkuser", "keytab": { @@ -411,7 +411,7 @@ "configuration": "accumulo-env/accumulo_principal_name", "type": "user", "local_username": "${accumulo-env/accumulo_user}", - "value": "${accumulo-env/accumulo_user}-${cluster_name|toLower()}@${realm}" + "value": "${accumulo-env/accumulo_user}${principal_suffix}@${realm}" }, "name": "accumulo", "keytab": { @@ -451,7 +451,7 @@ "configuration": "accumulo-site/trace.user", "type": "user", "local_username": "${accumulo-env/accumulo_user}", - "value": "tracer-${cluster_name|toLower()}@${realm}" + "value": "tracer${principal_suffix}@${realm}" }, "name": "accumulo_tracer", "keytab": { @@ -591,7 +591,7 @@ "configuration": "hbase-env/hbase_principal_name", "type": "user", "local_username": "${hbase-env/hbase_user}", - "value": "${hbase-env/hbase_user}-${cluster_name|toLower()}@${realm}" + "value": "${hbase-env/hbase_user}${principal_suffix}@${realm}" }, "name": "hbase", "keytab": { @@ -939,7 +939,7 @@ "principal": { "configuration": "storm-env/storm_principal_name", "type": "user", - "value": "${storm-env/storm_user}-${cluster_name|toLower()}@${realm}" + "value": "${storm-env/storm_user}${principal_suffix}@${realm}" }, "name": "storm_components", "keytab": { http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_no_hdfs.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_no_hdfs.json b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_no_hdfs.json index dcf5bbc..6d02062 100644 --- a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_no_hdfs.json +++ b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_no_hdfs.json @@ -25,7 +25,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${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}-${cluster_name|toLower()}@${realm}", + "value": "${cluster-env/smokeuser}${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/smokeuser_principal_name", "local_username": "${cluster-env/smokeuser}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_simple.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_simple.json b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_simple.json index fb884b7..21d09b5 100644 --- a/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_simple.json +++ b/ambari-server/src/test/resources/kerberos/test_kerberos_descriptor_simple.json @@ -25,7 +25,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${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}-${cluster_name|toLower()}@${realm}", + "value": "${cluster-env/smokeuser}${principal_suffix}@${realm}", "type": "user", "configuration": "cluster-env/smokeuser_principal_name", "local_username": "${cluster-env/smokeuser}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json index d53205d..a555bb5 100644 --- a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json +++ b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json @@ -18,7 +18,7 @@ { "name": "hdfs", "principal": { - "value": "${hadoop-env/hdfs_user}-${cluster_name|toLower()}@${realm}", + "value": "${hadoop-env/hdfs_user}${principal_suffix}@${realm}", "type" : "user" , "configuration": "hadoop-env/hdfs_principal_name", "local_username" : "${hadoop-env/hdfs_user}" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-web/test/utils/config_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js index bb3a308..f418614 100644 --- a/ambari-web/test/utils/config_test.js +++ b/ambari-web/test/utils/config_test.js @@ -1363,7 +1363,7 @@ describe('App.config', function() { configuration: "hbase-env/hbase_principal_name", type: "user", local_username: "${hbase-env/hbase_user}", - value: "${hbase-env/hbase_user}-${cluster_name|toLower()}@${realm}" + value: "${hbase-env/hbase_user}${principal_suffix}@${realm}" }, name: "hbase", keytab: { http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/ambari-web/test/utils/object_utils_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/utils/object_utils_test.js b/ambari-web/test/utils/object_utils_test.js index f70259c..47cee8c 100644 --- a/ambari-web/test/utils/object_utils_test.js +++ b/ambari-web/test/utils/object_utils_test.js @@ -486,7 +486,7 @@ describe('utils/object_utils', function() { }, { "principal" : { - "value" : "${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}", + "value" : "${cluster-env/smokeuser}${principal_suffix}@${realm}", "local_username" : "${cluster-env/smokeuser}", "configuration" : "cluster-env/smokeuser_principal_name", "type" : "user" http://git-wip-us.apache.org/repos/asf/ambari/blob/87eef6e9/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/kerberos.json ---------------------------------------------------------------------- diff --git a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/kerberos.json b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/kerberos.json index c5ebe20..6f6df72 100644 --- a/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/kerberos.json +++ b/contrib/management-packs/hdf-ambari-mpack/src/main/resources/stacks/HDF/2.0/kerberos.json @@ -2,7 +2,8 @@ "properties": { "realm": "${kerberos-env/realm}", "keytab_dir": "/etc/security/keytabs", - "additional_realms": "" + "additional_realms": "", + "principal_suffix": "-${cluster_name|toLower()}" }, "identities": [ { @@ -26,7 +27,7 @@ { "name": "smokeuser", "principal": { - "value": "${cluster-env/smokeuser}-${cluster_name|toLower()}@${realm}", + "value": "${cluster-env/smokeuser}${principal_suffix}@${realm}", "type" : "user", "configuration": "cluster-env/smokeuser_principal_name", "local_username" : "${cluster-env/smokeuser}" @@ -47,7 +48,7 @@ { "name": "ambari-server", "principal": { - "value": "ambari-server-${cluster_name|toLower()}@${realm}", + "value": "ambari-server${principal_suffix}@${realm}", "type" : "user", "configuration": "cluster-env/ambari_principal_name" },
