AMBARI-13929. Move displayType element for HAWQ/PXF from site_properties.json to stack definition (Bhuvnesh Chaudhary via odiachenko).

ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml

@@ -21,6 +21,9 @@
     <display-name>HAWQ Master</display-name>
     <value>localhost</value>
     <description>The host name of HAWQ master.</description>
+    <value-attributes>
+      <type>componentHost</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -28,6 +31,9 @@
     <display-name>HAWQ Standby Master</display-name>
     <value>localhost</value>
     <description>The host name of HAWQ standby.</description>
+    <value-attributes>
+      <type>componentHost</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -35,6 +41,9 @@
     <display-name>HAWQ Master Port</display-name>
     <value>5432</value>
     <description>The port of HAWQ master.</description>
+    <value-attributes>
+      <type>int</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -42,6 +51,9 @@
     <display-name>HAWQ Segment Port</display-name>
     <value>40000</value>
     <description>The port of HAWQ segment.</description>
+    <value-attributes>
+      <type>int</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -56,6 +68,9 @@
     <display-name>HAWQ Master Directory</display-name>
     <value>/data/hawq/master</value>
     <description>The directory of HAWQ master.</description>
+    <value-attributes>
+      <type>directory</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -63,6 +78,9 @@
     <display-name>HAWQ Segment Directory</display-name>
     <value>/data/hawq/segment</value>
     <description>The directory of HAWQ segment.</description>
+    <value-attributes>
+      <type>directory</type>
+    </value-attributes>
   </property> 
 
   <property>
@@ -70,6 +88,9 @@
     <display-name>HAWQ Master Temp Directory</display-name>
     <value>/tmp</value>
     <description>The temporary directory reserved for HAWQ master.</description>
+    <value-attributes>
+      <type>directory</type>
+    </value-attributes>
   </property>
 
   <property>
@@ -77,6 +98,9 @@
     <display-name>HAWQ Segment Temp Directory</display-name>
     <value>/tmp</value>
     <description>The temporary directory reserved for HAWQ segment.</description>
+    <value-attributes>
+      <type>directory</type>
+    </value-attributes>
   </property>
 
   <!-- HAWQ resource manager parameters -->

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

@@ -235,7 +235,6 @@ hdp23properties.push({
   /*********************************************** HAWQ **********************************************/
   {
     "name": "hawq_master_address_host",
-    "displayType": "componentHost",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -243,7 +242,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_standby_address_host",
-    "displayType": "componentHost",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -251,7 +249,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_master_address_port",
-    "displayType": "int",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -259,7 +256,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_segment_address_port",
-    "displayType": "int",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -274,7 +270,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_master_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -282,7 +277,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_master_temp_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -290,7 +284,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_segment_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -298,7 +291,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_segment_temp_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",

ambari-web/test/data/HDP2.3/site_properties_test.js

@@ -27,7 +27,7 @@ describe('hdp2SiteProperties', function () {
    */
   var stackProperties = siteProperties.filter(function(item){
     return  (!(item.isRequiredByAgent === false || item.filename === 'alert_notification' || item.category === 'Ambari Principals'
-    || item.name === 'oozie_hostname' || item.serviceName === 'HAWQ'))
+    || item.name === 'oozie_hostname'))
   });
 
   stackProperties.forEach(function(siteProperty){
@@ -76,4 +76,4 @@ describe('hdp2SiteProperties', function () {
     });
   });
 
-});
+});