Updated Branches: refs/heads/trunk 8167eff34 -> fc43264d6
AMBARI-3259: Security Wizard: Duplicate field for "Path to keytab file" on YARN tab (NodeManager section). (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/fc43264d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/fc43264d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/fc43264d Branch: refs/heads/trunk Commit: fc43264d621bd60d8a31fe6a76e277d0b1df2876 Parents: 8167eff Author: Jaimin Jetly <[email protected]> Authored: Tue Sep 17 11:25:17 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Sep 17 11:25:23 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/data/HDP2/secure_configs.js | 2 +- ambari-web/app/data/HDP2/secure_properties.js | 62 +++++++++++----------- ambari-web/app/data/secure_properties.js | 34 ++++++------ 3 files changed, 49 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/fc43264d/ambari-web/app/data/HDP2/secure_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/secure_configs.js b/ambari-web/app/data/HDP2/secure_configs.js index 5893795..f819ecc 100644 --- a/ambari-web/app/data/HDP2/secure_configs.js +++ b/ambari-web/app/data/HDP2/secure_configs.js @@ -53,7 +53,7 @@ module.exports = [ displayName: 'MapReduce2', filename: 'mapred-site', configCategories: [ - App.ServiceConfigCategory.create({ name: 'JobHistoryServer', displayName: 'Job History Server'}) + App.ServiceConfigCategory.create({ name: 'JobHistoryServer', displayName: 'History Server'}) ], sites: ['mapred-site'], configs: configProperties.filterProperty('serviceName', 'MAPREDUCE2') http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/fc43264d/ambari-web/app/data/HDP2/secure_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/secure_properties.js b/ambari-web/app/data/HDP2/secure_properties.js index 82298d3..0ae330b 100644 --- a/ambari-web/app/data/HDP2/secure_properties.js +++ b/ambari-web/app/data/HDP2/secure_properties.js @@ -84,7 +84,7 @@ module.exports = { "id": "puppet var", "name": "smokeuser_principal_name", - "displayName": "Smoke test user Principal", + "displayName": "Smoke test user principal", "value": "", "defaultValue": "ambari-qa", "description": "This is the principal name for Smoke test user", @@ -111,7 +111,7 @@ module.exports = { "id": "puppet var", "name": "hdfs_principal_name", - "displayName": "HDFS User Principal", + "displayName": "HDFS user principal", "value": "", "defaultValue": "hdfs", "description": "This is the principal name for HDFS user", @@ -138,7 +138,7 @@ module.exports = { "id": "puppet var", "name": "hbase_principal_name", - "displayName": "HBase User Principal", + "displayName": "HBase user principal", "value": "", "defaultValue": "hbase", "description": "This is the principal name for HBase user", @@ -279,7 +279,7 @@ module.exports = "displayName": "Web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access for JournalNode. _HOST will get automatically replaced with actual hostname at instance of JournalNode", + "description": "Principal name for SPNEGO access for JournalNode. _HOST will get automatically replaced with actual hostname at instance of JournalNode", "displayType": "principal", "isVisible": false, "isOverridable": false, @@ -289,7 +289,7 @@ module.exports = { "id": "puppet var", "name": "journalnode_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/jn.service.keytab", "description": "Path to JournalNode keytab file", @@ -356,7 +356,7 @@ module.exports = { "id": "puppet var", "name": "datanode_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/dn.service.keytab", "description": "Path to DataNode keytab file", @@ -370,10 +370,10 @@ module.exports = { "id": "puppet var", "name": "hadoop_http_principal_name", - "displayName": "DFS Web Principal name", + "displayName": "DFS web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access for NameNode and SNameNode. _HOST will get automatically replaced with actual hostname at instance of NameNode and SNameNode", + "description": "Principal name for SPNEGO access for NameNode and SNameNode. _HOST will get automatically replaced with actual hostname at instance of NameNode and SNameNode", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -383,10 +383,10 @@ module.exports = { "id": "puppet var", "name": "hadoop_http_keytab", - "displayName": "Path to spnego keytab file", + "displayName": "Path to SPNEGO keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for NameNode and SNameNode", + "description": "Path to SPNEGO keytab file for NameNode and SNameNode", "displayType": "directory", "isVisible": true, "isOverridable": false, @@ -398,7 +398,7 @@ module.exports = { "id": "puppet var", "name": "jobhistoryserver_host", - "displayName": "Job History Server", + "displayName": "History Server host", "value": "", "defaultValue": "", "description": "The host that has been assigned to run JobHistoryServer", @@ -442,7 +442,7 @@ module.exports = "displayName": "Web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access to Job History Server. _HOST will get automatically replaced with actual hostname at an instance of Job History Server", + "description": "Principal name for SPNEGO access to Job History Server. _HOST will get automatically replaced with actual hostname at an instance of Job History Server", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -452,10 +452,10 @@ module.exports = { "id": "puppet var", "name": "jobhistory_http_keytab", - "displayName": "Path to spnego keytab file", + "displayName": "Path to SPNEGO keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for Job History Server", + "description": "Path to SPNEGO keytab file for Job History Server", "displayType": "directory", "isVisible": true, "isOverridable": false, @@ -467,7 +467,7 @@ module.exports = { "id": "puppet var", "name": "resourcemanager_host", - "displayName": "ResourceManager", + "displayName": "ResourceManager host", "value": "", "defaultValue": "", "description": "The host that has been assigned to run ResourceManager", @@ -511,7 +511,7 @@ module.exports = "displayName": "Web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access to ResourceManager. _HOST will get automatically replaced with actual hostname at an instance of ResourceManager", + "description": "Principal name for SPNEGO access to ResourceManager. _HOST will get automatically replaced with actual hostname at an instance of ResourceManager", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -521,10 +521,10 @@ module.exports = { "id": "puppet var", "name": "resourcemanager_http_keytab", - "displayName": "Path to spnego keytab file", + "displayName": "Path to SPNEGO keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for ResourceManager", + "description": "Path to SPNEGO keytab file for ResourceManager", "displayType": "directory", "isVisible": true, "isOverridable": false, @@ -534,7 +534,7 @@ module.exports = { "id": "puppet var", "name": "nodemanager_host", - "displayName": "NodeManager", + "displayName": "NodeManager hosts", "value": "", "defaultValue": "", "description": "The hosts that has been assigned to run NodeManager", @@ -578,7 +578,7 @@ module.exports = "displayName": "Web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access to NodeManager. _HOST will get automatically replaced with actual hostname at all instances of NodeManager", + "description": "Principal name for SPNEGO access to NodeManager. _HOST will get automatically replaced with actual hostname at all instances of NodeManager", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -588,10 +588,10 @@ module.exports = { "id": "puppet var", "name": "nodemanager_http_keytab", - "displayName": "Path to keytab file", + "displayName": "Path to SPNEGO keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for NodeManager", + "description": "Path to SPNEGO keytab file for NodeManager", "displayType": "directory", "isVisible": true, "isOverridable": false, @@ -632,7 +632,7 @@ module.exports = "displayName": "Principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access for WebHCat", + "description": "Principal name for SPNEGO access for WebHCat", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -645,7 +645,7 @@ module.exports = "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for WebHCat", + "description": "Path to SPNEGO keytab file for WebHCat", "displayType": "directory", "isVisible": true, "isOverridable": false, @@ -684,7 +684,7 @@ module.exports = { "id": "puppet var", "name": "hbase_master_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/hbase.service.keytab", "description": "Path to HBase master keytab file", @@ -725,7 +725,7 @@ module.exports = { "id": "puppet var", "name": "hbase_regionserver_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/hbase.service.keytab", "description": "Path to HBase RegionServer keytab file", @@ -768,7 +768,7 @@ module.exports = { "id": "puppet var", "name": "hive_metastore_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/hive.service.keytab", "description": "Path to Hive Metastore and HiveServer2 keytab file", @@ -825,10 +825,10 @@ module.exports = { "id": "puppet var", "name": "oozie_http_principal_name", - "displayName": "Oozie Web Principal name", + "displayName": "Web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access for Oozie", + "description": "Principal name for SPNEGO access to Oozie", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -838,10 +838,10 @@ module.exports = { "id": "puppet var", "name": "oozie_http_keytab", - "displayName": "Path to spnego keytab file", + "displayName": "Path to SPNEGO keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for oozie", + "description": "Path to SPNEGO keytab file for oozie", "displayType": "directory", "isVisible": true, "isOverridable": false, http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/fc43264d/ambari-web/app/data/secure_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/secure_properties.js b/ambari-web/app/data/secure_properties.js index 356bdf0..eab10ce 100644 --- a/ambari-web/app/data/secure_properties.js +++ b/ambari-web/app/data/secure_properties.js @@ -84,7 +84,7 @@ module.exports = { "id": "puppet var", "name": "smokeuser_principal_name", - "displayName": "Smoke test user Principal", + "displayName": "Smoke test user principal", "value": "", "defaultValue": "ambari-qa", "description": "This is the principal name for Smoke test user", @@ -111,7 +111,7 @@ module.exports = { "id": "puppet var", "name": "hdfs_principal_name", - "displayName": "HDFS User Principal", + "displayName": "HDFS user principal", "value": "", "defaultValue": "hdfs", "description": "This is the principal name for HDFS user", @@ -138,7 +138,7 @@ module.exports = { "id": "puppet var", "name": "hbase_principal_name", - "displayName": "HBase User Principal", + "displayName": "HBase user principal", "value": "", "defaultValue": "hbase", "description": "This is the principal name for HBase user", @@ -302,7 +302,7 @@ module.exports = { "id": "puppet var", "name": "datanode_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/dn.service.keytab", "description": "Path to DataNode keytab file", @@ -316,10 +316,10 @@ module.exports = { "id": "puppet var", "name": "hadoop_http_principal_name", - "displayName": "DFS Web Principal name", + "displayName": "DFS web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access for NameNode and SNameNode. _HOST will get automatically replaced with actual hostname at instance of NameNode and SNameNode", + "description": "Principal name for SPNEGO access for NameNode and SNameNode. _HOST will get automatically replaced with actual hostname at instance of NameNode and SNameNode", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -329,10 +329,10 @@ module.exports = { "id": "puppet var", "name": "hadoop_http_keytab", - "displayName": "Path to spnego keytab file", + "displayName": "Path to SPNEGO keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for NameNode and SNameNode", + "description": "Path to SPNEGO keytab file for NameNode and SNameNode", "displayType": "directory", "isVisible": true, "isOverridable": false, @@ -457,7 +457,7 @@ module.exports = "displayName": "Principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access for WebHCat", + "description": "Principal name for SPNEGO access for WebHCat", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -470,7 +470,7 @@ module.exports = "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for WebHCat", + "description": "Path to SPNEGO keytab file for WebHCat", "displayType": "directory", "isVisible": true, "isOverridable": false, @@ -508,7 +508,7 @@ module.exports = { "id": "puppet var", "name": "hbase_master_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/hbase.service.keytab", "description": "Path to HBase master keytab file", @@ -549,7 +549,7 @@ module.exports = { "id": "puppet var", "name": "hbase_regionserver_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/hbase.service.keytab", "description": "Path to HBase RegionServer keytab file", @@ -592,7 +592,7 @@ module.exports = { "id": "puppet var", "name": "hive_metastore_keytab", - "displayName": "Path to Keytab file", + "displayName": "Path to keytab file", "value": "", "defaultValue": "/etc/security/keytabs/hive.service.keytab", "description": "Path to Hive Metastore and HiveServer2 keytab file", @@ -649,10 +649,10 @@ module.exports = { "id": "puppet var", "name": "oozie_http_principal_name", - "displayName": "Oozie Web Principal name", + "displayName": "Web principal name", "value": "", "defaultValue": "HTTP/_HOST", - "description": "Principal name for spnego access for Oozie", + "description": "Principal name for SPNEGO access to Oozie", "displayType": "principal", "isVisible": true, "isOverridable": false, @@ -662,10 +662,10 @@ module.exports = { "id": "puppet var", "name": "oozie_http_keytab", - "displayName": "Path to spnego keytab file", + "displayName": "Path to SPNEGO keytab file", "value": "", "defaultValue": "/etc/security/keytabs/spnego.service.keytab", - "description": "Path to spnego keytab file for oozie", + "description": "Path to SPNEGO keytab file for oozie", "displayType": "directory", "isVisible": true, "isOverridable": false,
