AMBARI-3060: yarn.nodemanager.log-dirs is displayed twice on yarn service page. (jaimin)

ambari-server/src/main/resources/stacks/HDP/2.0.5/services/YARN/configuration/yarn-site.xml

@@ -141,7 +141,7 @@
 
   <property>
     <name>yarn.nodemanager.log-dirs</name>
-    <value></value>
+    <value>/hadoop/yarn</value>
     <description>
       Where to store container logs. An application's localized log directory
       will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.

ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/YARN/configuration/yarn-site.xml

@@ -141,7 +141,7 @@
 
   <property>
     <name>yarn.nodemanager.log-dirs</name>
-    <value></value>
+    <value>/hadoop/yarn</value>
     <description>
       Where to store container logs. An application's localized log directory
       will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.

ambari-web/app/data/HDP2/config_mapping.js

@@ -344,13 +344,6 @@ var configs = [
     "value": "<templateName[0]>",
     "filename": "yarn-site.xml"
   },
-  {
-    "name": "yarn.nodemanager.log-dirs",
-    "templateName": ["yarn_nodemanager_log-dirs"],
-    "foreignKey": null,
-    "value": "<templateName[0]>",
-    "filename": "yarn-site.xml"
-  },
 /**********************************************mapred-site***************************************/
   {
     "name": "mapreduce.jobhistory.webapp.address",

ambari-web/app/data/HDP2/global_properties.js

@@ -737,23 +737,6 @@ module.exports =
       "serviceName": "YARN",
       "category": "Advanced"
     },
-    {
-      "id": "puppet var",
-      "name": "yarn_nodemanager_log-dirs",
-      "displayName": "yarn.nodemanager.log-dirs",
-      "defaultValue": "",
-      "description": "Where to store container logs. An application's localized log directory\
-      will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.\
-      Individual containers' log directories will be below this, in directories\
-      named container_{$contid}. Each container directory will contain the files\
-      stderr, stdin, and syslog generated by that container.",
-      "defaultDirectory": "/hadoop/yarn",
-      "displayType": "directories",
-      "isReconfigurable": true,
-      "isVisible": true,
-      "serviceName": "YARN",
-      "category": "Advanced"
-    },
   /**********************************************HBASE***************************************/
     {
       "id": "puppet var",

ambari-web/app/data/HDP2/site_properties.js

@@ -22,6 +22,7 @@ module.exports =
       "id": "site property",
       "name": "yarn.acl.enable",
       "displayName": "yarn.acl.enable",
+      "displayType": "checkbox",
       "value": "",
       "defaultValue": "",
       "serviceName": "YARN",
@@ -40,6 +41,7 @@ module.exports =
       "id": "site property",
       "name": "yarn.log-aggregation-enable",
       "displayName": "yarn.log-aggregation-enable",
+      "displayType": "checkbox",
       "value": "",
       "defaultValue": "",
       "serviceName": "YARN",
@@ -94,8 +96,13 @@ module.exports =
       "id": "site property",
       "name": "yarn.nodemanager.log-dirs",
       "displayName": "yarn.nodemanager.log-dirs",
-      "value": "",
       "defaultValue": "",
+      "description": "Where to store container logs. An application's localized log directory\
+      will be found in ${yarn.nodemanager.log-dirs}/application_${appid}.\
+      Individual containers' log directories will be below this, in directories\
+      named container_{$contid}. Each container directory will contain the files\
+      stderr, stdin, and syslog generated by that container.",
+      "defaultDirectory": "/hadoop/yarn",
       "displayType": "directories",
       "serviceName": "YARN",
       "category": "NodeManager"

ambari-web/app/models/service_config.js

@@ -34,7 +34,7 @@ App.ServiceConfig = Ember.Object.extend({
           overrideErrors += 1;
         }
       })
-    })
+    });
     var masterErrors = this.get('configs').filterProperty('isValid', false).filterProperty('isVisible', true).get('length');
     var slaveErrors = 0;
     this.get('configCategories').forEach(function (_category) {
@@ -289,7 +289,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'dfs_data_dir':
       case 'dfs_datanode_data_dir':
       case 'yarn_nodemanager_local-dirs':
-      case 'yarn_nodemanager_log-dirs':
+      case 'yarn.nodemanager.log-dirs':
       case 'mapred_local_dir':
       case 'mapreduce_cluster_local_dir':
         this.unionAllMountPoints(!isOnlyFirstOneNeeded, localDB);
@@ -353,7 +353,7 @@ App.ServiceConfigProperty = Ember.Object.extend({
           setOfHostNames.push(host.hostName);
         }, this);
         break;
-      case 'yarn_nodemanager_log-dirs':
+      case 'yarn.nodemanager.log-dirs':
       case 'yarn_nodemanager_local-dirs':
         temp = slaveComponentHostsInDB.findProperty('componentName', 'NODEMANAGER');
         temp.hosts.forEach(function (host) {