ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odiache...@apache.org
Subject ambari git commit: AMBARI-13929. Move displayType element for HAWQ/PXF from site_properties.json to stack definition (Bhuvnesh Chaudhary via odiachenko).
Date Tue, 24 Nov 2015 01:33:03 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3650059aa -> f548ce08d


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f548ce08
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f548ce08
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f548ce08

Branch: refs/heads/branch-2.1
Commit: f548ce08d99ea0009e16f23a8a0e7dcc6171d748
Parents: 3650059
Author: Oleksandr Diachenko <odiachenko@pivotal.io>
Authored: Mon Nov 23 17:32:49 2015 -0800
Committer: Oleksandr Diachenko <odiachenko@pivotal.io>
Committed: Mon Nov 23 17:32:53 2015 -0800

----------------------------------------------------------------------
 .../HAWQ/2.0.0/configuration/hawq-site.xml      | 24 ++++++++++++++++++++
 ambari-web/app/data/HDP2.3/site_properties.js   |  8 -------
 .../test/data/HDP2.3/site_properties_test.js    |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f548ce08/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
b/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
index 41b10dc..862b2ee 100644
--- a/ambari-server/src/main/resources/common-services/HAWQ/2.0.0/configuration/hawq-site.xml
+++ b/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 -->

http://git-wip-us.apache.org/repos/asf/ambari/blob/f548ce08/ambari-web/app/data/HDP2.3/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js b/ambari-web/app/data/HDP2.3/site_properties.js
index 5150ff2..fb79cd3 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -271,7 +271,6 @@ hdp23properties.push({
   /*********************************************** HAWQ **********************************************/
   {
     "name": "hawq_master_address_host",
-    "displayType": "masterHost",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -279,7 +278,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_standby_address_host",
-    "displayType": "masterHost",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -287,7 +285,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_master_address_port",
-    "displayType": "int",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -295,7 +292,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_segment_address_port",
-    "displayType": "int",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -310,7 +306,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_master_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -318,7 +313,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_master_temp_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -326,7 +320,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_segment_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",
@@ -334,7 +327,6 @@ hdp23properties.push({
   },
   {
     "name": "hawq_segment_temp_directory",
-    "displayType": "directory",
     "filename": "hawq-site.xml",
     "category": "General",
     "serviceName": "HAWQ",

http://git-wip-us.apache.org/repos/asf/ambari/blob/f548ce08/ambari-web/test/data/HDP2.3/site_properties_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/data/HDP2.3/site_properties_test.js b/ambari-web/test/data/HDP2.3/site_properties_test.js
index 48a1988..7d0f970 100644
--- a/ambari-web/test/data/HDP2.3/site_properties_test.js
+++ b/ambari-web/test/data/HDP2.3/site_properties_test.js
@@ -26,7 +26,7 @@ describe('hdp2SiteProperties', function () {
    * @stackProperties: All the properties that are derived from stack definition
    */
   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'))
+    return  (!(item.isRequiredByAgent === false || item.filename === 'alert_notification'
|| item.category === 'Ambari Principals' || item.name === 'oozie_hostname'))
   });
 
   stackProperties.forEach(function(siteProperty){


Mime
View raw message