Author: yusaku
Date: Tue May 14 00:41:10 2013
New Revision: 1482159
URL: http://svn.apache.org/r1482159
Log:
AMBARI-2121. Allow Nagios user to be customized during install. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/assets/data/configurations/cluster_level_configs.json
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step7_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=1482159&r1=1482158&r2=1482159&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue May 14 00:41:10 2013
@@ -290,6 +290,8 @@ Trunk (unreleased changes):
IMPROVEMENTS
+ AMBARI-2121. Allow Nagios user to be customized during install. (yusaku)
+
AMBARI-2111. Enable customization of smoke test user. (yusaku)
AMBARI-2110. Update hive-site.xml, set fs.file.impl.disable.cache=true.
Modified:
incubator/ambari/trunk/ambari-web/app/assets/data/configurations/cluster_level_configs.json
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/configurations/cluster_level_configs.json?rev=1482159&r1=1482158&r2=1482159&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/assets/data/configurations/cluster_level_configs.json
(original)
+++
incubator/ambari/trunk/ambari-web/app/assets/data/configurations/cluster_level_configs.json
Tue May 14 00:41:10 2013
@@ -503,6 +503,7 @@
"namenode_opt_maxnewsize" : "640m",
"regionserver_memstore_lab" : "true",
"namenode_opt_newsize" : "200m",
+ "smokeuser" : "ambari-qa",
"mapreduce_userlog_retainhours" : "24",
"hcat_conf_dir" : "",
"nagios_user" : "nagios",
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=1482159&r1=1482158&r2=1482159&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
Tue May 14 00:41:10 2013
@@ -104,6 +104,7 @@ App.WizardStep7Controller = Em.Controlle
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'));
+ miscConfigs.findProperty('name', 'nagios_user').set('isVisible',
this.get('selectedServiceNames').contains('NAGIOS'));
},
/**
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=1482159&r1=1482158&r2=1482159&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/config_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/config_properties.js Tue May 14
00:41:10 2013
@@ -2025,22 +2025,9 @@ module.exports =
},
{
"id": "puppet var",
- "name": "nagios_user",
- "displayName": "Nagios username",
- "description": "Nagios username",
- "defaultValue": "nagios",
- "isReconfigurable": false,
- "displayType": "user",
- "isOverridable": false,
- "domain": "global",
- "isVisible": false,
- "serviceName": "NAGIOS"
- },
- {
- "id": "puppet var",
"name": "nagios_group",
- "displayName": "Nagios username",
- "description": "Nagios username",
+ "displayName": "Nagios Group",
+ "description": "Nagios Group",
"defaultValue": "nagios",
"isReconfigurable": false,
"displayType": "user",
@@ -2717,6 +2704,20 @@ module.exports =
},
{
"id": "puppet var",
+ "name": "nagios_user",
+ "displayName": "Nagios User",
+ "description": "User to run Nagios as",
+ "defaultValue": "nagios",
+ "isReconfigurable": false,
+ "displayType": "user",
+ "isOverridable": false,
+ "domain": "global",
+ "isVisible": true,
+ "serviceName":"MISC",
+ "category": "Users and Groups"
+ },
+ {
+ "id": "puppet var",
"name": "smokeuser",
"displayName": "Smoke Test User",
"description": "The user used to run service smoke tests",
