Repository: ambari Updated Branches: refs/heads/trunk 7777302b7 -> b7902decc
AMBARI-7913. Pig Service Check, Tez, and WebHCat need dynamic tar properties in cluster-env.xml (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7902dec Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7902dec Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7902dec Branch: refs/heads/trunk Commit: b7902decc82ba02f9ab1f286ab407ca4d99767d1 Parents: 7777302 Author: Alejandro Fernandez <[email protected]> Authored: Wed Oct 22 16:48:18 2014 -0700 Committer: Alejandro Fernandez <[email protected]> Committed: Thu Oct 23 10:54:32 2014 -0700 ---------------------------------------------------------------------- .../HDP/2.2/configuration/cluster-env.xml | 7 -- ambari-web/app/data/HDP2/site_properties.js | 123 ++++++++++++++++++- 2 files changed, 120 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7902dec/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml index 5c7ea79..b1f0803 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/configuration/cluster-env.xml @@ -21,12 +21,6 @@ --> <configuration> - <!-- TODO, this property needs to be removed in AMBARI-7884. --> - <property> - <name>rpm_version</name> - <value>2.2.0.0</value> - <description>Hadoop RPM version</description> - </property> <!-- The properties that end in tar_source describe the pattern of where the tar.gz files come from. They will replace {{ hdp_stack_version }} with the "#.#.#.#" value followed by -* (which is the build number in HDP 2.2), @@ -61,7 +55,6 @@ </property> <!-- Pig tarball is needed by WebHCat. --> - <!-- TODO, pig is missing the build number. --> <property> <name>pig_tar_source</name> <value>/usr/hdp/current/pig-client/pig-{{ component_version }}.{{ hdp_stack_version }}.tar.gz</value> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7902dec/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index 6c0f29d..44d97d9 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -2049,9 +2049,126 @@ module.exports = }, { "id": "puppet var", - "name": "rpm_version", - "displayName": "Hadoop RPM version", - "description": "Hadoop RPM version", + "name": "tez_tar_source", + "displayName": "Tez tarball source", + "description": "Source file path that uses dynamic variables and regex to copy the file to HDFS.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "tez_tar_destination_folder", + "displayName": "Tez tarball destination folder", + "description": "Destination HDFS folder for the file.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "hive_tar_source", + "displayName": "Hive tarball source", + "description": "Source file path that uses dynamic variables and regex to copy the file to HDFS.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "hive_tar_destination_folder", + "displayName": "Hive tarball destination folder", + "description": "Destination HDFS folder for the file.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "pig_tar_source", + "displayName": "Pig tarball source", + "description": "Source file path that uses dynamic variables and regex to copy the file to HDFS.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "pig_tar_destination_folder", + "displayName": "Pig tarball destination folder", + "description": "Destination HDFS folder for the file.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "hadoop-streaming_tar_source", + "displayName": "hadoop-streaming.jar source", + "description": "Source file path that uses dynamic variables and regex to copy the file to HDFS.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "hadoop-streaming_tar_destination_folder", + "displayName": "hadoop-streaming.jar destination folder", + "description": "Destination HDFS folder for the file.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "sqoop_tar_source", + "displayName": "Sqoop tarball source", + "description": "Source file path that uses dynamic variables and regex to copy the file to HDFS.", + "defaultValue": '', + "isRequired": true, + "isOverridable": false, + "isVisible": false, + "isEditable": false, + "serviceName": "MISC", + "filename": "cluster-env.xml" + }, + { + "id": "puppet var", + "name": "sqoop_tar_destination_folder", + "displayName": "Sqoop tarball destination folder", + "description": "Destination HDFS folder for the file.", "defaultValue": '', "isRequired": true, "isOverridable": false,
