Repository: ambari Updated Branches: refs/heads/branch-2.5 4209954fe -> 6ab074be3
AMBARI-18692. Exporting blueprint from kerberos enabled cluster, exports hardcoded values cluster name and realm in principal_name property (Amruta Borkar via alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ab074be Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ab074be Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ab074be Branch: refs/heads/branch-2.5 Commit: 6ab074be3b8fde6694f2b0aacef17b8939b48bdd Parents: 4209954 Author: Alejandro Fernandez <[email protected]> Authored: Fri Jan 20 12:17:54 2017 -0800 Committer: Alejandro Fernandez <[email protected]> Committed: Fri Jan 20 12:17:54 2017 -0800 ---------------------------------------------------------------------- .../internal/BlueprintConfigurationProcessor.java | 11 ++++++----- .../apache/ambari/server/controller/internal/Stack.java | 7 +++++++ .../org/apache/ambari/server/state/PropertyInfo.java | 3 ++- .../ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml | 1 + .../AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml | 2 ++ .../0.1.0/configuration/ams-hbase-security-site.xml | 4 ++++ .../0.1.0.2.3/configuration/application-properties.xml | 1 + .../DRUID/0.9.2/configuration/druid-common.xml | 1 + .../HBASE/0.96.0.2.0/configuration/hbase-env.xml | 1 + .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 1 + .../KAFKA/0.8.1/configuration/kafka-env.xml | 1 + .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml | 1 + .../KNOX/0.5.0.2.2/configuration/knox-env.xml | 1 + .../LOGSEARCH/0.5.0/configuration/logfeeder-env.xml | 2 ++ .../LOGSEARCH/0.5.0/configuration/logsearch-env.xml | 2 ++ .../0.5.0/configuration/logsearch-properties.xml | 1 + .../RANGER/0.6.0/configuration/ranger-admin-site.xml | 3 +++ .../RANGER/0.6.0/configuration/ranger-tagsync-site.xml | 1 + .../RANGER/0.6.0/configuration/ranger-ugsync-site.xml | 1 + .../RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml | 2 ++ .../SPARK/1.2.1/configuration/spark-defaults.xml | 1 + .../SPARK/1.2.1/configuration/spark-env.xml | 1 + .../SPARK2/2.0.0/configuration/spark2-defaults.xml | 1 + .../SPARK2/2.0.0/configuration/spark2-env.xml | 1 + .../STORM/0.9.1/configuration/storm-env.xml | 4 ++++ .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 1 + .../ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml | 1 + .../src/main/resources/configuration-schema.xsd | 1 + 28 files changed, 52 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java index b26e056..ad27b0d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java @@ -171,7 +171,7 @@ public class BlueprintConfigurationProcessor { new SimplePropertyNameExportFilter("domains", "krb5-conf"), new SimplePropertyNameExportFilter("dfs_ha_initial_namenode_active", "hadoop-env"), new SimplePropertyNameExportFilter("dfs_ha_initial_namenode_standby", "hadoop-env"), - new StackPasswordPropertyFilter() + new StackPropertyTypeFilter() }; /** @@ -2988,16 +2988,16 @@ public class BlueprintConfigurationProcessor { } } /** - * A Filter that excludes properties if in stack a property is marked as password property + * A Filter that excludes properties if in stack a property is marked as password property or kerberos principal * */ - private static class StackPasswordPropertyFilter implements PropertyFilter { + private static class StackPropertyTypeFilter implements PropertyFilter { /** * Query to determine if a given property should be included in a collection of * properties. * - * This implementation filters property if in stack configuration is the property type is password. + * This implementation filters property if in stack configuration is the property type is password or kerberos principal. * * @param propertyName property name * @param propertyValue property value @@ -3011,7 +3011,8 @@ public class BlueprintConfigurationProcessor { public boolean isPropertyIncluded(String propertyName, String propertyValue, String configType, ClusterTopology topology) { Stack stack = topology.getBlueprint().getStack(); final String serviceName = stack.getServiceForConfigType(configType); - return !stack.isPasswordProperty(serviceName, configType, propertyName); + return !(stack.isPasswordProperty(serviceName, configType, propertyName) || + stack.isKerberosPrincipalNameProperty(serviceName, configType, propertyName)); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java index 16f75ee..034866e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/Stack.java @@ -381,6 +381,13 @@ public class Stack { return configMap; } + public boolean isKerberosPrincipalNameProperty(String service, String type, String propertyName) { + return (serviceConfigurations.containsKey(service) && + serviceConfigurations.get(service).containsKey(type) && + serviceConfigurations.get(service).get(type).containsKey(propertyName) && + serviceConfigurations.get(service).get(type).get(propertyName).getPropertyTypes(). + contains(PropertyInfo.PropertyType.KERBEROS_PRINCIPAL)); + } /** * Get config attributes for the specified service and configuration type. * http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java index 5881a10..34c2941 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/PropertyInfo.java @@ -270,6 +270,7 @@ public class PropertyInfo { TEXT, ADDITIONAL_USER_PROPERTY, NOT_MANAGED_HDFS_PATH, - VALUE_FROM_PROPERTY_FILE + VALUE_FROM_PROPERTY_FILE, + KERBEROS_PRINCIPAL } } http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml index 1d330dd..1e5eb54 100644 --- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml +++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/configuration/accumulo-env.xml @@ -185,6 +185,7 @@ <property> <name>accumulo_principal_name</name> <description>Accumulo principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml index d7ae236..27f001e 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml @@ -190,6 +190,7 @@ <value>infra-solr</value> <display-name>Infra Solr principal</display-name> <description>The service principal for Infra Solr.</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="false"/> </property> @@ -206,6 +207,7 @@ <value>HTTP/[email protected]</value> <display-name>Infra Solr Http principal</display-name> <description>The service principal for the Infra Solr.</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="false"/> </property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml index 2be101b..bf6cbd1 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-hbase-security-site.xml @@ -31,6 +31,7 @@ <property> <name>ams.zookeeper.principal</name> <value/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -63,6 +64,7 @@ <property> <name>hbase.master.kerberos.principal</name> <value/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -87,6 +89,7 @@ <property> <name>hbase.myclient.principal</name> <value/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -95,6 +98,7 @@ <property> <name>hbase.regionserver.kerberos.principal</name> <value/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml index e86abcc..e4fc3de 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml @@ -108,6 +108,7 @@ <name>atlas.authentication.principal</name> <value>atlas</value> <description/> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml index 0ded5d6..265bf46 100644 --- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml +++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/configuration/druid-common.xml @@ -194,6 +194,7 @@ <name>druid.hadoop.security.kerberos.principal</name> <display-name>kerberos principal</display-name> <description>Kerberos principal e.g [email protected]</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="false"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 2ab6aa0..3ff67d4 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -132,6 +132,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. <property> <name>hbase_principal_name</name> <description>HBase principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml index c2a7d9c..bc64d1f 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml @@ -235,6 +235,7 @@ <property> <name>hdfs_principal_name</name> <description>HDFS principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <!-- hadoop-env.sh --> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml index e8a76b6..91af58e 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-env.xml @@ -40,6 +40,7 @@ <property> <name>kafka_principal_name</name> <description>Kafka principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml index 7016437..965ee13 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml @@ -255,6 +255,7 @@ <description> The principal name to use when executing the Kerberos service check </description> + <property-type>KERBEROS_PRINCIPAL</property-type> <value>${cluster_name|toLower()}-${short_date}</value> <value-attributes> <overridable>false</overridable> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml index 2e5a026..680e81f 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/configuration/knox-env.xml @@ -72,6 +72,7 @@ <property> <name>knox_principal_name</name> <description>Knox principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml index fb641a8..508ef4e 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logfeeder-env.xml @@ -130,6 +130,7 @@ <value></value> <display-name>Log Feeder External Solr principal</display-name> <description>The service principal for Log Feeder which will be used to access SolrClient e.g. logfeeder/_HOST@REALM</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> @@ -144,6 +145,7 @@ <value>logfeeder</value> <display-name>Log Feeder Solr principal</display-name> <description>The service principal for Log Feeder which will be used to access Log Search Solr.</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml index a6f1502..10b21be 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-env.xml @@ -110,6 +110,7 @@ <value></value> <display-name>Log Search External Solr principal</display-name> <description>The service principal for Log Search which will be used to access SolrClient e.g. logsearch/_HOST@REALM</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> @@ -174,6 +175,7 @@ <value>logsearch</value> <display-name>Log Search principal</display-name> <description>The service principal for Log Search which will be used to access SolrClient.</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <!-- logsearch-env.sh --> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml index 47872ee..d57b98b 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/configuration/logsearch-properties.xml @@ -258,6 +258,7 @@ <value/> <display-name>Http Spnego principal</display-name> <description>Principal for SPNEGO authentication for Http requests</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml index 36ebc8c..76b6c06 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-admin-site.xml @@ -71,6 +71,7 @@ <name>ranger.spnego.kerberos.principal</name> <value>*</value> <description/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -89,6 +90,7 @@ <name>ranger.admin.kerberos.principal</name> <value/> <description/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> @@ -107,6 +109,7 @@ <name>ranger.lookup.kerberos.principal</name> <value/> <description/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml index a0bd322..8a9d5bb 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-tagsync-site.xml @@ -147,6 +147,7 @@ <name>ranger.tagsync.kerberos.principal</name> <value/> <description/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml index d267b75..1b4913c 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER/0.6.0/configuration/ranger-ugsync-site.xml @@ -20,6 +20,7 @@ <name>ranger.usersync.kerberos.principal</name> <value/> <description/> + <property-type>KERBEROS_PRINCIPAL</property-type> <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml index 1bce4e6..59a6952 100644 --- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml +++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml @@ -74,6 +74,7 @@ <name>hadoop.kms.authentication.kerberos.principal</name> <value>HTTP/localhost</value> <description>The Kerberos principal to use for the HTTP endpoint. The principal must start with 'HTTP/' as per the Kerberos HTTP SPNEGO specification.</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> @@ -120,6 +121,7 @@ <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal</name> <value>kms/#HOSTNAME#</value> <description>The Kerberos service principal used to connect to Zookeeper.</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml index d8ab28c..76c4af5 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-defaults.xml @@ -155,6 +155,7 @@ <description> Kerberos principal name for the Spark History Server. </description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml index 71a42f7..55d67cc 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.1/configuration/spark-env.xml @@ -79,6 +79,7 @@ <name>hive_kerberos_principal</name> <value>{{hive_kerberos_principal}}</value> <description>hive principal for spark thrift server</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <!-- spark-env.sh --> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml index a5115af..eea4c64 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-defaults.xml @@ -79,6 +79,7 @@ <description> Kerberos principal name for the Spark History Server. </description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml index b78fd79..aa9ab50 100755 --- a/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml +++ b/ambari-server/src/main/resources/common-services/SPARK2/2.0.0/configuration/spark2-env.xml @@ -79,6 +79,7 @@ <name>hive_kerberos_principal</name> <value>{{hive_kerberos_principal}}</value> <description>hive principal for spark thrift server</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <!-- spark-env.sh --> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml index 5d0b2ff..4cfe3d5 100644 --- a/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml +++ b/ambari-server/src/main/resources/common-services/STORM/0.9.1/configuration/storm-env.xml @@ -59,11 +59,13 @@ <property> <name>storm_principal_name</name> <description>Storm principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> <name>storm_principal_name</name> <description>Storm principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> @@ -74,6 +76,7 @@ <property> <name>storm_ui_principal_name</name> <description>Storm UI principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> @@ -89,6 +92,7 @@ <property> <name>nimbus_principal_name</name> <description>Nimbus principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index e6c59d5..677158c 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -166,6 +166,7 @@ export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}" <description> Kerberos principal name for the Zeppelin. </description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml index 696b28a..5a1529d 100644 --- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml +++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5/configuration/zookeeper-env.xml @@ -72,6 +72,7 @@ <property> <name>zookeeper_principal_name</name> <description>ZooKeeper principal name</description> + <property-type>KERBEROS_PRINCIPAL</property-type> <on-ambari-upgrade add="true"/> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/6ab074be/ambari-server/src/main/resources/configuration-schema.xsd ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/configuration-schema.xsd b/ambari-server/src/main/resources/configuration-schema.xsd index eeb0f68..1019dd9 100644 --- a/ambari-server/src/main/resources/configuration-schema.xsd +++ b/ambari-server/src/main/resources/configuration-schema.xsd @@ -136,6 +136,7 @@ <xs:enumeration value="ADDITIONAL_USER_PROPERTY"/> <xs:enumeration value="NOT_MANAGED_HDFS_PATH"/> <xs:enumeration value="VALUE_FROM_PROPERTY_FILE"/> + <xs:enumeration value="KERBEROS_PRINCIPAL"/> </xs:restriction> </xs:simpleType> </xs:schema>
