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 2014/02/26 06:17:21 UTC
git commit: AMBARI-4833. Falcon: core-site needs
hadoop.proxyuser..hosts=* and
hadoop.proxyuser..groups=. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 8119a9d3e -> a46484e4b
AMBARI-4833. Falcon: core-site needs hadoop.proxyuser.<falcon-username>.hosts=* and hadoop.proxyuser.<falcon-username>.groups=<proxy-group>. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a46484e4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a46484e4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a46484e4
Branch: refs/heads/trunk
Commit: a46484e4b5ff8f72c1dd26b077f5a9412b68074e
Parents: 8119a9d
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Feb 25 21:14:20 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Feb 25 21:14:20 2014 -0800
----------------------------------------------------------------------
ambari-web/app/data/HDP2/config_mapping.js | 16 +++++
ambari-web/app/data/HDP2/global_properties.js | 71 +++++++++++-----------
ambari-web/app/models/service_config.js | 2 +-
3 files changed, 52 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a46484e4/ambari-web/app/data/HDP2/config_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/config_mapping.js b/ambari-web/app/data/HDP2/config_mapping.js
index c3757e5..1eeeffd 100644
--- a/ambari-web/app/data/HDP2/config_mapping.js
+++ b/ambari-web/app/data/HDP2/config_mapping.js
@@ -67,6 +67,22 @@ var configs = [
"filename": "core-site.xml",
"isOverridable": true
},
+ {
+ "name": "hadoop.proxyuser.<foreignKey[0]>.groups",
+ "templateName": ["proxyuser_group"],
+ "foreignKey": ["falcon_user"],
+ "value": "<templateName[0]>",
+ "filename": "core-site.xml",
+ "isOverridable": true
+ },
+ {
+ "name": "hadoop.proxyuser.<foreignKey[0]>.hosts",
+ "templateName": ["falconserver_host"],
+ "foreignKey": ["falcon_user"],
+ "value": "<templateName[0]>",
+ "filename": "core-site.xml",
+ "isOverridable": true
+ },
/********************GLUSTERFS*************************************/
{
"name": "fs.glusterfs.impl",
http://git-wip-us.apache.org/repos/asf/ambari/blob/a46484e4/ambari-web/app/data/HDP2/global_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/global_properties.js b/ambari-web/app/data/HDP2/global_properties.js
index 07d3a51..d4c5103 100644
--- a/ambari-web/app/data/HDP2/global_properties.js
+++ b/ambari-web/app/data/HDP2/global_properties.js
@@ -1326,14 +1326,13 @@ module.exports =
/**********************************************FALCON***************************************/
{
"id": "puppet var",
- "name": "falcon_user",
- "displayName": "Falcon user",
- "description": "",
+ "name": "falconserver_host",
+ "displayName": "Falcon Server",
+ "description": "The host that has been assigned to run Falcon Server",
"defaultValue": "falcon",
- "isReconfigurable": true,
- "displayType": "user",
+ "displayType": "masterHost",
"isVisible": true,
- "isRequiredByAgent": true,
+ "isRequiredByAgent": false,
"serviceName": "FALCON",
"category": "Falcon"
},
@@ -1519,7 +1518,7 @@ module.exports =
{
"id": "puppet var",
"name": "proxyuser_group",
- "displayName": "Proxy group for Hive, WebHCat, and Oozie",
+ "displayName": "Proxy group for Hive, WebHCat, Oozie and Falcon",
"description": "",
"defaultValue": "users",
"isReconfigurable": false,
@@ -1529,7 +1528,7 @@ module.exports =
"filename": "core-site.xml",
"serviceName": "MISC",
"category": "Users and Groups",
- "belongsToService":["HIVE","WEBHCAT","OOZIE"]
+ "belongsToService":["HIVE","WEBHCAT","OOZIE","FALCON"]
},
{
"id": "puppet var",
@@ -1658,6 +1657,34 @@ module.exports =
},
{
"id": "puppet var",
+ "name": "falcon_user",
+ "displayName": "Falcon User",
+ "description": "User to run Falcon as",
+ "defaultValue": "falcon",
+ "isReconfigurable": false,
+ "displayType": "user",
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName":"MISC",
+ "category": "Users and Groups",
+ "belongsToService":["FALCON"]
+ },
+ {
+ "id": "puppet var",
+ "name": "storm_user",
+ "displayName": "Storm User",
+ "description": "User to run Storm as",
+ "defaultValue": "storm",
+ "isReconfigurable": false,
+ "displayType": "user",
+ "isOverridable": false,
+ "isVisible": true,
+ "serviceName":"MISC",
+ "category": "Users and Groups",
+ "belongsToService":["STORM"]
+ },
+ {
+ "id": "puppet var",
"name": "zk_user",
"displayName": "ZooKeeper User",
"description": "User to run ZooKeeper as",
@@ -1756,34 +1783,6 @@ module.exports =
},
{
"id": "puppet var",
- "name": "storm_user",
- "displayName": "Storm User",
- "description": "User to run Storm as",
- "defaultValue": "storm",
- "isReconfigurable": false,
- "displayType": "user",
- "isOverridable": false,
- "isVisible": true,
- "serviceName":"MISC",
- "category": "Users and Groups",
- "belongsToService":["STORM"]
- },
- {
- "id": "puppet var",
- "name": "falcon_user",
- "displayName": "Falcon User",
- "description": "User to run Falcon as",
- "defaultValue": "falcon",
- "isReconfigurable": false,
- "displayType": "user",
- "isOverridable": false,
- "isVisible": true,
- "serviceName":"MISC",
- "category": "Users and Groups",
- "belongsToService":["FALCON"]
- },
- {
- "id": "puppet var",
"name": "rrdcached_base_dir",
"displayName": "Ganglia rrdcached base directory",
"description": "Default directory for saving the rrd files on ganglia server",
http://git-wip-us.apache.org/repos/asf/ambari/blob/a46484e4/ambari-web/app/models/service_config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js
index 2611bb0..a98d06c 100644
--- a/ambari-web/app/models/service_config.js
+++ b/ambari-web/app/models/service_config.js
@@ -410,7 +410,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
case 'nimbus.host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'NIMBUS').hostName);
break;
- case 'falconserver.host':
+ case 'falconserver_host':
this.set('value', masterComponentHostsInDB.findProperty('component', 'FALCON_SERVER').hostName);
break;
case 'logviewerserver_host':