AMBARI-4773. Remove redirection in config values to just ambari known properties. (jaimin)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hdfs-site.xml

@@ -150,33 +150,18 @@
     </description>
   </property>
 
-  <property>
-    <name>ambari.dfs.datanode.port</name>
-    <value>50010</value>
-    <description>
-      The datanode port for data transfer. This property is effective only if referenced from dfs.datanode.address property.
-    </description>
-  </property>
-
   <property>
     <name>dfs.datanode.address</name>
-    <value>0.0.0.0:${ambari.dfs.datanode.port}</value>
+    <value>0.0.0.0:50010</value>
     <description>
       The datanode server address and port for data transfer.
     </description>
   </property>
 
-  <property>
-    <name>ambari.dfs.datanode.http.port</name>
-    <value>50075</value>
-    <description>
-      The datanode http port. This property is effective only if referenced from dfs.datanode.http.address property.
-    </description>
-  </property>
 
   <property>
     <name>dfs.datanode.http.address</name>
-    <value>0.0.0.0:${ambari.dfs.datanode.http.port}</value>
+    <value>0.0.0.0:50075</value>
     <description>
       The datanode http server address and port.
     </description>

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/mapred-site.xml

@@ -284,15 +284,9 @@
     <description>Logger configuration for the TaskTracker child processes</description>
   </property>
 
-  <property>
-    <name>ambari.mapred.child.java.opts.memory</name>
-    <value>768</value>
-    <description>Java options Memory for the TaskTracker child processes</description>
-  </property>
-
   <property>
     <name>mapred.child.java.opts</name>
-    <value>-server -Xmx${ambari.mapred.child.java.opts.memory}m -Djava.net.preferIPv4Stack=true</value>
+    <value>-server -Xmx768m -Djava.net.preferIPv4Stack=true</value>
     <description>Java options for the TaskTracker child processes</description>
   </property>
 

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py

@@ -60,7 +60,7 @@ rm_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resource
 nm_port = "8042"
 hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.history.server.http.address'])
 journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.journalnode.http-address'])
-datanode_port = config['configurations']['hdfs-site']['ambari.dfs.datanode.http.port']
+datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
 flume_port = "4159"
 hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
 templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml

@@ -181,33 +181,17 @@
     </description>
   </property>
 
-  <property>
-    <name>ambari.dfs.datanode.port</name>
-    <value>50010</value>
-    <description>
-      The datanode port for data transfer. This property is effective only if referenced from dfs.datanode.address property.
-    </description>
-  </property>
-
   <property>
     <name>dfs.datanode.address</name>
-    <value>0.0.0.0:${ambari.dfs.datanode.port}</value>
+    <value>0.0.0.0:50010</value>
     <description>
       The datanode server address and port for data transfer.
     </description>
   </property>
 
-  <property>
-    <name>ambari.dfs.datanode.http.port</name>
-    <value>50075</value>
-    <description>
-      The datanode http port. This property is effective only if referenced from dfs.datanode.http.address property.
-    </description>
-  </property>
-
   <property>
     <name>dfs.datanode.http.address</name>
-    <value>0.0.0.0:${ambari.dfs.datanode.http.port}</value>
+    <value>0.0.0.0:50075</value>
     <description>
       The datanode http server address and port.
     </description>

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py

@@ -60,7 +60,7 @@ rm_port = get_port_from_url(config['configurations']['yarn-site']['yarn.resource
 nm_port = "8042"
 hs_port = get_port_from_url(config['configurations']['mapred-site']['mapreduce.jobhistory.webapp.address'])
 journalnode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.journalnode.http-address'])
-datanode_port = config['configurations']['hdfs-site']['ambari.dfs.datanode.http.port']
+datanode_port = get_port_from_url(config['configurations']['hdfs-site']['dfs.datanode.http.address'])
 flume_port = "4159"
 hive_metastore_port = config['configurations']['global']['hive_metastore_port'] #"9083"
 templeton_port = config['configurations']['webhcat-site']['templeton.port'] #"50111"

ambari-web/app/controllers/main/admin/security/disable.js

@@ -104,11 +104,11 @@ App.MainAdminSecurityDisableController = App.MainAdminSecurityProgressController
             var configName = _config.name;
             if (configName in _serviceConfigTags.configs) {
               switch (configName) {
-                case 'ambari.dfs.datanode.port':
-                  _serviceConfigTags.configs[configName] = '50010';
+                case 'dfs.datanode.address':
+                  _serviceConfigTags.configs[configName] = '0.0.0.0:50010';
                   break;
-                case 'ambari.dfs.datanode.http.port':
-                  _serviceConfigTags.configs[configName] = '50075';
+                case 'dfs.datanode.http.address':
+                  _serviceConfigTags.configs[configName] = '0.0.0.0:50075';
                   break;
                 case 'mapred.task.tracker.task-controller':
                   _serviceConfigTags.configs[configName] = 'org.apache.hadoop.mapred.DefaultTaskController';

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

@@ -146,18 +146,18 @@ module.exports = [
     "serviceName": "HDFS"
   },
   {
-    "name": "ambari.dfs.datanode.port",
+    "name": "dfs.datanode.address",
     "templateName": ["dfs_datanode_address"],
     "foreignKey": null,
-    "value": "<templateName[0]>",
+    "value": "0.0.0.0:<templateName[0]>",
     "filename": "hdfs-site.xml",
     "serviceName": "HDFS"
   },
   {
-    "name": "ambari.dfs.datanode.http.port",
+    "name": "dfs.datanode.http.address",
     "templateName": ["dfs_datanode_http_address"],
     "foreignKey": null,
-    "value": "<templateName[0]>",
+    "value": "0.0.0.0:<templateName[0]>",
     "filename": "hdfs-site.xml",
     "serviceName": "HDFS"
   },

ambari-web/app/data/secure_mapping.js

@@ -123,18 +123,18 @@ module.exports = [
     "serviceName": "HDFS"
   },
   {
-    "name": "ambari.dfs.datanode.port",
+    "name": "dfs.datanode.address",
     "templateName": ["dfs_datanode_address"],
     "foreignKey": null,
-    "value": "<templateName[0]>",
+    "value": "0.0.0.0:<templateName[0]>",
     "filename": "hdfs-site.xml",
     "serviceName": "HDFS"
   },
   {
-    "name": "ambari.dfs.datanode.http.port",
+    "name": "dfs.datanode.http.address",
     "templateName": ["dfs_datanode_http_address"],
     "foreignKey": null,
-    "value": "<templateName[0]>",
+    "value": "0.0.0.0:<templateName[0]>",
     "filename": "hdfs-site.xml",
     "serviceName": "HDFS"
   },

ambari-web/app/data/site_properties.js

@@ -336,12 +336,11 @@ module.exports =
     },
     {
       "id": "site property",
-      "name": "ambari.mapred.child.java.opts.memory",
+      "name": "mapred.child.java.opts",
       "displayName": "Java options for MapReduce tasks",
       "description": "Java options for the TaskTracker child processes.",
       "defaultValue": "",
-      "displayType": "int",
-      "unit": "MB",
+      "displayType": "advanced",
       "category": "TaskTracker",
       "serviceName": "MAPREDUCE",
       "index": 4