AMBARI-1981. Expose ability to customize the username for running Ganglia daemons. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1469639 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)
 

ambari-web/app/controllers/wizard/step7_controller.js

@@ -102,6 +102,7 @@ App.WizardStep7Controller = Em.Controller.extend({
     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'));
   },
 

ambari-web/app/controllers/wizard/step8_controller.js

@@ -1329,6 +1329,8 @@ App.WizardStep8Controller = Em.Controller.extend({
       }
       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};
   },
 

ambari-web/app/data/config_properties.js

@@ -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",
@@ -2068,6 +2040,34 @@ module.exports =
       "serviceName": "MISC",
       "category": "Users and Groups"
     },
+    {
+      "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",