Author: yusaku
Date: Thu Apr 18 23:44:01 2013
New Revision: 1469639
URL: http://svn.apache.org/r1469639
Log:
AMBARI-1981. Expose ability to customize the username for running Ganglia
daemons. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/trunk/ambari-web/app/data/config_properties.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469639&r1=1469638&r2=1469639&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 18 23:44:01 2013
@@ -269,6 +269,9 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-1981. Expose ability to customize the username for running
+ Ganglia daemons. (yusaku)
+
AMBARI-1987. Add unit tests for admin/cluster page and cluster loading.
(yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js?rev=1469639&r1=1469638&r2=1469639&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_controller.js
Thu Apr 18 23:44:01 2013
@@ -102,6 +102,7 @@ App.WizardStep7Controller = Em.Controlle
miscConfigs.findProperty('name', 'webhcat_user').set('isVisible',
this.get('selectedServiceNames').contains('WEBHCAT'));
miscConfigs.findProperty('name', 'oozie_user').set('isVisible',
this.get('selectedServiceNames').contains('OOZIE'));
miscConfigs.findProperty('name', 'zk_user').set('isVisible',
this.get('selectedServiceNames').contains('ZOOKEEPER'));
+ miscConfigs.findProperty('name', 'gmetad_user').set('isVisible',
this.get('selectedServiceNames').contains('GANGLIA'));
miscConfigs.findProperty('name', 'rrdcached_base_dir').set('isVisible',
this.get('selectedServiceNames').contains('GANGLIA'));
},
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1469639&r1=1469638&r2=1469639&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
Thu Apr 18 23:44:01 2013
@@ -1329,6 +1329,8 @@ App.WizardStep8Controller = Em.Controlle
}
this._recordHostOverrideFromObj(_globalSiteObj, 'global', 'version1',
this);
}, this);
+ // we don't expose gmond_user to the user; it needs to be the same as
gmetad_user
+ globalSiteProperties['gmond_user'] = globalSiteProperties['gmetad_user'];
return {"type": "global", "tag": "version1", "properties":
globalSiteProperties};
},
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=1469639&r1=1469638&r2=1469639&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Thu Apr 18
23:44:01 2013
@@ -1154,34 +1154,6 @@ module.exports =
"serviceName": "MISC",
"category": "General"
},
- {
- "id": "puppet var",
- "name": "gmetad_user",
- "displayName": "gmetad_user",
- "description": "",
- "defaultValue": "nobody",
- "isReconfigurable": false,
- "displayType": "advanced",
- "isOverridable": false,
- "isVisible": false,
- "domain": "global",
- "serviceName": "MISC",
- "category": "Users and Groups"
- },
- {
- "id": "puppet var",
- "name": "gmond_user",
- "displayName": "gmond_user",
- "description": "",
- "defaultValue": "nobody",
- "isReconfigurable": false,
- "displayType": "advanced",
- "isOverridable": false,
- "isVisible": false,
- "domain": "global",
- "serviceName":"MISC",
- "category": "Users and Groups"
- },
/*
{
"id": "puppet var",
@@ -2070,6 +2042,34 @@ module.exports =
},
{
"id": "puppet var",
+ "name": "gmetad_user",
+ "displayName": "Ganglia User",
+ "description": "The user used to run Ganglia",
+ "defaultValue": "nobody",
+ "isReconfigurable": false,
+ "displayType": "advanced",
+ "isOverridable": false,
+ "isVisible": true,
+ "domain": "global",
+ "serviceName": "MISC",
+ "category": "Users and Groups"
+ },
+ {
+ "id": "puppet var",
+ "name": "gmond_user",
+ "displayName": "Gmond User",
+ "description": "The user used to run gmond for Ganglia",
+ "defaultValue": "nobody",
+ "isReconfigurable": false,
+ "displayType": "advanced",
+ "isOverridable": false,
+ "isVisible": false,
+ "domain": "global",
+ "serviceName":"MISC",
+ "category": "Users and Groups"
+ },
+ {
+ "id": "puppet var",
"name": "smokeuser",
"displayName": "Smoke Test User",
"description": "The user used to run service smoke tests",
