You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/06/04 22:19:39 UTC
svn commit: r1489590 - in /incubator/ambari/trunk/ambari-web/app/data:
HDP2/config_mapping.js HDP2/config_properties.js config_mapping.js
config_properties.js
Author: jaimin
Date: Tue Jun 4 20:19:22 2013
New Revision: 1489590
URL: http://svn.apache.org/r1489590
Log:
AMBARI-2240: Allow Security related configs to be modified via custom settings. (jaimin)
Modified:
incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js
incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js
incubator/ambari/trunk/ambari-web/app/data/config_mapping.js
incubator/ambari/trunk/ambari-web/app/data/config_properties.js
Modified: incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js?rev=1489590&r1=1489589&r2=1489590&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/HDP2/config_mapping.js Tue Jun 4 20:19:22 2013
@@ -186,34 +186,7 @@ var configs = [
"value": "<templateName[0]>",
"filename": "hdfs-site.xml"
},
- {
- "name": "dfs.namenode.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "nn\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.secondary.namenode.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "nn\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.namenode.kerberos.https.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "host\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.secondary.namenode.kerberos.https.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "host\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
+
{
"name": "dfs.secondary.http.address",
"templateName": ["snamenode_host"],
@@ -222,41 +195,6 @@ var configs = [
"filename": "hdfs-site.xml"
},
{
- "name": "dfs.web.authentication.kerberos.keytab",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/spnego.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.datanode.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "dn\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.namenode.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/nn.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.secondary.namenode.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/nn.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.datanode.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/dn.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
"name": "dfs.https.address",
"templateName": ["namenode_host"],
"foreignKey": null,
@@ -600,27 +538,6 @@ var configs = [
"filename": "hbase-site.xml"
},
{
- "name": "hbase.master.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>/hm.service.keytab",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.master.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "hm/_HOST@<templateName[0]>",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.regionserver.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "rs/_HOST@<templateName[0]>",
- "filename": "hbase-site.xml"
- },
- {
"name": "dfs.support.append",
"templateName": ["hdfs_support_append"],
"foreignKey": null,
Modified: incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js?rev=1489590&r1=1489589&r2=1489590&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/HDP2/config_properties.js Tue Jun 4 20:19:22 2013
@@ -414,44 +414,6 @@ module.exports =
},
{
"id": "puppet var",
- "name": "kerberos_domain",
- "displayName": "Kerberos realm",
- "description": "Kerberos realm",
- "defaultValue": "EXAMPLE.COM",
- "isRequired": true,
- "isVisible": false,
- "domain": "global",
- "serviceName": "HDFS",
- "category": "Advanced"
- },
- {
- "id": "puppet var",
- "name": "kadmin_pw",
- "displayName": "password",
- "description": "Kerberos admin password",
- "defaultValue": "",
- "isRequired": true,
- "displayType": "password",
- "isVisible": false,
- "domain": "global",
- "serviceName": "HDFS",
- "category": "Advanced"
- },
- {
- "id": "puppet var",
- "name": "keytab_path",
- "displayName": "Keytab directory",
- "description": "Kerberos admin password",
- "defaultValue": "/etc/security/keytabs",
- "isRequired": true,
- "displayType": "advanced",
- "isVisible": false,
- "domain": "global",
- "serviceName": "HDFS",
- "category": "Advanced"
- },
- {
- "id": "puppet var",
"name": "namenode_formatted_mark_dir",
"displayName": "Hadoop formatted mark directory",
"description": "",
Modified: incubator/ambari/trunk/ambari-web/app/data/config_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_mapping.js?rev=1489590&r1=1489589&r2=1489590&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_mapping.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_mapping.js Tue Jun 4 20:19:22 2013
@@ -194,34 +194,6 @@ var configs = [
"filename": "hdfs-site.xml"
},
{
- "name": "dfs.namenode.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "nn\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.secondary.namenode.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "nn\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.namenode.kerberos.https.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "host\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.secondary.namenode.kerberos.https.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "host\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
"name": "dfs.secondary.http.address",
"templateName": ["snamenode_host"],
"foreignKey": null,
@@ -229,41 +201,6 @@ var configs = [
"filename": "hdfs-site.xml"
},
{
- "name": "dfs.web.authentication.kerberos.keytab",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/spnego.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.datanode.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "dn\/_HOST@<templateName[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.namenode.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/nn.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.secondary.namenode.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/nn.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.datanode.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>\/dn.service.keytab",
- "filename": "hdfs-site.xml"
- },
- {
"name": "dfs.https.address",
"templateName": ["namenode_host"],
"foreignKey": null,
@@ -277,22 +214,6 @@ var configs = [
"value": "<templateName[0]>",
"filename": "hdfs-site.xml"
},
- /*
- {
- "name": "dfs.namenode.kerberos.internal.spnego.principal",
- "templateName": [],
- "foreignKey": ["dfs.web.authentication.kerberos.principal"],
- "value": "<foreignKey[0]>",
- "filename": "hdfs-site.xml"
- },
- {
- "name": "dfs.secondary.namenode.kerberos.internal.spnego.principal",
- "templateName": [],
- "foreignKey": ["dfs.web.authentication.kerberos.principal"],
- "value": "<foreignKey[0]>",
- "filename": "hdfs-site.xml"
- },
- */
{
"name": "mapred.local.dir",
"templateName": ["mapred_local_dir"],
@@ -300,15 +221,6 @@ var configs = [
"value": "<templateName[0]>",
"filename": "mapred-site.xml"
},
- /*
- {
- "name": "oozie.service.StoreService.jdbc.url",
- "templateName": ["oozie_data_dir"],
- "foreignKey": ["oozie.db.schema.name"],
- "value": "<templateName[0]>\/<foreignKey[0]>",
- "filename": "oozie-site.xml"
- },
- */
{
"name": "oozie.base.url",
"templateName": ["oozieserver_host"],
@@ -549,34 +461,6 @@ var configs = [
"filename": "mapred-site.xml"
},
{
- "name": "mapreduce.jobtracker.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "jt/_HOST@<templateName[0]>",
- "filename": "mapred-site.xml"
- },
- {
- "name": "mapreduce.tasktracker.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "tt/_HOST@<templateName[0]>",
- "filename": "mapred-site.xml"
- },
- {
- "name": "mapreduce.jobtracker.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>/jt.service.keytab",
- "filename": "mapred-site.xml"
- },
- {
- "name": "mapreduce.tasktracker.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>/tt.service.keytab",
- "filename": "mapred-site.xml"
- },
- {
"name": "mapreduce.history.server.embedded",
"templateName": [],
"foreignKey": null,
@@ -591,20 +475,6 @@ var configs = [
"filename": "mapred-site.xml"
},
{
- "name": "mapreduce.jobhistory.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "jt/_HOST@<templateName[0]>",
- "filename": "mapred-site.xml"
- },
- {
- "name": "mapreduce.jobhistory.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>/jt.service.keytab",
- "filename": "mapred-site.xml"
- },
- {
"name": "hbase.rootdir",
"templateName": ["namenode_host", "hbase_hdfs_root_dir"],
"foreignKey": null,
@@ -747,37 +617,6 @@ var configs = [
"filename": "hbase-site.xml"
},
{
- "name": "hbase.master.keytab.file",
- "templateName": ["keytab_path"],
- "foreignKey": null,
- "value": "<templateName[0]>/hm.service.keytab",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.master.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "hm/_HOST@<templateName[0]>",
- "filename": "hbase-site.xml"
- },
- {
- "name": "hbase.regionserver.kerberos.principal",
- "templateName": ["kerberos_domain"],
- "foreignKey": null,
- "value": "rs/_HOST@<templateName[0]>",
- "filename": "hbase-site.xml"
- },
- /*
- {
- "name": "hbase.coprocessor.region.classes",
- "templateName": ["preloaded_regioncoprocessor_classes"],
- "foreignKey": null,
- "value": "<templateName[0]>",
- "filename": "hbase-site.xml"
- },
- */
-
- {
"name": "dfs.support.append",
"templateName": ["hdfs_support_append"],
"foreignKey": null,
Modified: incubator/ambari/trunk/ambari-web/app/data/config_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/config_properties.js?rev=1489590&r1=1489589&r2=1489590&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Tue Jun 4 20:19:22 2013
@@ -427,44 +427,6 @@ module.exports =
},
{
"id": "puppet var",
- "name": "kerberos_domain",
- "displayName": "Kerberos realm",
- "description": "Kerberos realm",
- "defaultValue": "EXAMPLE.COM",
- "isRequired": true,
- "isVisible": false,
- "domain": "global",
- "serviceName": "HDFS",
- "category": "Advanced"
- },
- {
- "id": "puppet var",
- "name": "kadmin_pw",
- "displayName": "password",
- "description": "Kerberos admin password",
- "defaultValue": "",
- "isRequired": true,
- "displayType": "password",
- "isVisible": false,
- "domain": "global",
- "serviceName": "HDFS",
- "category": "Advanced"
- },
- {
- "id": "puppet var",
- "name": "keytab_path",
- "displayName": "Keytab directory",
- "description": "Kerberos admin password",
- "defaultValue": "/etc/security/keytabs",
- "isRequired": true,
- "displayType": "advanced",
- "isVisible": false,
- "domain": "global",
- "serviceName": "HDFS",
- "category": "Advanced"
- },
- {
- "id": "puppet var",
"name": "namenode_formatted_mark_dir",
"displayName": "Hadoop formatted mark directory",
"description": "",