ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [08/12] git commit: AMBARI-7444 webhcat-pig and webhcat-hive RPMS are no longer needed (dsen)
Date Tue, 23 Sep 2014 16:03:03 GMT
AMBARI-7444 webhcat-pig and webhcat-hive RPMS are no longer needed (dsen)


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

Branch: refs/heads/branch-alerts-dev
Commit: 715ffa83445774cb9b0f34434fae3f4ddb594a20
Parents: 061dc10
Author: Dmytro Sen <dsen@hortonworks.com>
Authored: Tue Sep 23 13:31:45 2014 +0300
Committer: Dmytro Sen <dsen@hortonworks.com>
Committed: Tue Sep 23 13:31:45 2014 +0300

----------------------------------------------------------------------
 .../stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py   | 4 ++++
 .../stacks/HDP/2.0.6/services/HIVE/package/scripts/webhcat.py  | 4 ++--
 .../main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml   | 6 ------
 3 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/715ffa83/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
index cda202d..9652fb0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/params.py
@@ -41,6 +41,8 @@ if rpm_version is not None:
   tez_local_api_jars = '/usr/hdp/current/tez/tez*.jar'
   tez_local_lib_jars = '/usr/hdp/current/tez/lib/*.jar'
   tez_tar_file = "/usr/hdp/current/tez/lib/tez*.tar.gz"
+  pig_tar_file = '/usr/hdp/current/pig/pig.tar.gz'
+  hive_tar_file = '/usr/hdp/current/hive/hive.tar.gz'
 
   hcat_lib = '/usr/hdp/current/hive/hive-hcatalog/share/hcatalog'
   webhcat_bin_dir = '/usr/hdp/current/hive/hive-hcatalog/sbin'
@@ -54,6 +56,8 @@ else:
   tez_local_api_jars = '/usr/lib/tez/tez*.jar'
   tez_local_lib_jars = '/usr/lib/tez/lib/*.jar'
   tez_tar_file = "/usr/lib/tez/tez*.tar.gz"
+  pig_tar_file = '/usr/share/HDP-webhcat/pig.tar.gz'
+  hive_tar_file = '/usr/share/HDP-webhcat/hive.tar.gz'
 
   if str(hdp_stack_version).startswith('2.0'):
     hcat_lib = '/usr/lib/hcatalog/share/hcatalog'

http://git-wip-us.apache.org/repos/asf/ambari/blob/715ffa83/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/webhcat.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/webhcat.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/webhcat.py
index 287049b..6ce47f5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/webhcat.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/package/scripts/webhcat.py
@@ -95,7 +95,7 @@ def webhcat():
                 hadoop_conf_dir=params.hadoop_conf_dir
   )
 
-  CopyFromLocal('/usr/share/HDP-webhcat/pig.tar.gz',
+  CopyFromLocal(params.pig_tar_file,
                 owner=params.webhcat_user,
                 mode=0755,
                 dest_dir=params.webhcat_apps_dir,
@@ -105,7 +105,7 @@ def webhcat():
                 hadoop_conf_dir=params.hadoop_conf_dir
   )
 
-  CopyFromLocal('/usr/share/HDP-webhcat/hive.tar.gz',
+  CopyFromLocal(params.hive_tar_file,
                 owner=params.webhcat_user,
                 mode=0755,
                 dest_dir=params.webhcat_apps_dir,

http://git-wip-us.apache.org/repos/asf/ambari/blob/715ffa83/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
index 90765d6..c5a9f48 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/metainfo.xml
@@ -37,12 +37,6 @@
             <package>
               <name>hive_2_9_9_9_*-webhcat</name>
             </package>
-            <package>
-              <name>webhcat-tar-hive</name>
-            </package>
-            <package>
-              <name>webhcat-tar-pig</name>
-            </package>
           </packages>
         </osSpecific>
         <osSpecific>


Mime
View raw message