You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2017/03/22 06:10:20 UTC

[29/52] bigtop git commit: Making ODPi Ambari stack compatible with ODPi packaging (getting rid of /usr/hdp)

Making ODPi Ambari stack compatible with ODPi packaging (getting rid of /usr/hdp)

(cherry picked from commit eb6a89809672ef41ec481176ac7bf732e4082243)


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

Branch: refs/heads/master
Commit: 7bd98d5a2a28c3760b0436cb3b7ad825046e8c64
Parents: 4ded443
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Fri Oct 28 10:56:11 2016 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Tue Mar 21 23:08:10 2017 -0700

----------------------------------------------------------------------
 .../ODPi/1.0/services/HIVE/package/scripts/params_linux.py    | 7 +++++--
 .../ODPi/1.0/services/HIVE/package/scripts/status_params.py   | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/7bd98d5a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py
index b33d715..9d79e12 100755
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py
+++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/params_linux.py
@@ -195,8 +195,11 @@ purge_tables = 'true'
 
 # this is NOT a typo.  Configs for hcatalog/webhcat point to a
 # specific directory which is NOT called 'conf'
-hcat_conf_dir = format('{stack_root}/current/hive-webhcat/etc/hcatalog')
-config_dir = format('{stack_root}/current/hive-webhcat/etc/webhcat')
+# FIXME: ODPi
+# hcat_conf_dir = format('{stack_root}/current/hive-webhcat/etc/hcatalog')
+# config_dir = format('{stack_root}/current/hive-webhcat/etc/webhcat')
+hcat_conf_dir = format('/etc/hive-hcatalog/conf')
+config_dir = format('/etc/hive-webhcat/conf')
 
 hive_metastore_site_supported = True
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/7bd98d5a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py
index 024f3df..a7b2e3f 100755
--- a/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py
+++ b/bigtop-packages/src/common/ambari/ODPi/1.0/services/HIVE/package/scripts/status_params.py
@@ -108,7 +108,8 @@ else:
   if check_stack_feature(StackFeature.HIVE_WEBHCAT_SPECIFIC_CONFIGS, stack_version_formatted_major):
     # this is NOT a typo. Configs for hcatalog/webhcat point to a
     # specific directory which is NOT called 'conf'
-    webhcat_conf_dir = format("{stack_root}/current/hive-webhcat/etc/webhcat")
+    #  FIXME ODPi: webhcat_conf_dir = format("{stack_root}/current/hive-webhcat/etc/webhcat")
+    webhcat_conf_dir = format("/etc/hive-webhcat/conf")
 
   # if stack version supports hive serve interactive
   if check_stack_feature(StackFeature.HIVE_SERVER_INTERACTIVE, stack_version_formatted_major):