ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject git commit: AMBARI-5021. 2.1.1 is hard coded in our python scripts which causes WEBHCAT install to fail. (aonishuk)
Date Tue, 11 Mar 2014 15:04:08 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e788c8b81 -> ae5f8519f


AMBARI-5021. 2.1.1 is hard coded in our python scripts which causes
WEBHCAT install to fail. (aonishuk)


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

Branch: refs/heads/trunk
Commit: ae5f8519fb056afe103b7017a456049ce02931da
Parents: e788c8b
Author: Andrew Onischuk <aonishuk@hortonworks.com>
Authored: Tue Mar 11 08:03:06 2014 -0700
Committer: Andrew Onischuk <aonishuk@hortonworks.com>
Committed: Tue Mar 11 08:03:06 2014 -0700

----------------------------------------------------------------------
 .../HDP/2.0.6/services/HIVE/package/scripts/params.py     | 10 ++++++----
 .../HDP/2.0.6/services/WEBHCAT/package/scripts/params.py  |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ae5f8519/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 1ddf0ad..a71e444 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
@@ -107,12 +107,14 @@ mysql_host = config['clusterHostInfo']['hive_mysql_host']
 mysql_adduser_path = "/tmp/addMysqlUser.sh"
 
 ########## HCAT
-if config['hostLevelParams']['stack_version'] == '2.1.1':
-  hcat_conf_dir = '/etc/hive-hcatalog/conf'
-  hcat_lib = '/usr/lib/hive-hcatalog/share/hcatalog'
-else:
+
+if str(config['hostLevelParams']['stack_version']).startswith('2.0'):
   hcat_conf_dir = '/etc/hcatalog/conf'
   hcat_lib = '/usr/lib/hcatalog/share/hcatalog'
+# for newer versions
+else:
+  hcat_conf_dir = '/etc/hive-hcatalog/conf'
+  hcat_lib = '/usr/lib/hive-hcatalog/share/hcatalog'
 
 
 metastore_port = 9933

http://git-wip-us.apache.org/repos/asf/ambari/blob/ae5f8519/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/params.py
index 033ed99..12d87b7 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/WEBHCAT/package/scripts/params.py
@@ -30,12 +30,13 @@ hcat_user = config['configurations']['global']['hcat_user']
 webhcat_user = config['configurations']['global']['webhcat_user']
 download_url = config['configurations']['global']['apache_artifacts_download_url']
 
-if config['hostLevelParams']['stack_version'] == '2.1.1':
-  config_dir = '/etc/hive-webhcat/conf'
-  webhcat_bin_dir = '/usr/lib/hive-hcatalog/sbin'
-else:
+if str(config['hostLevelParams']['stack_version']).startswith('2.0'):
   config_dir = '/etc/hcatalog/conf'
   webhcat_bin_dir = '/usr/lib/hcatalog/sbin'
+# for newer versions
+else:
+  config_dir = '/etc/hive-webhcat/conf'
+  webhcat_bin_dir = '/usr/lib/hive-hcatalog/sbin'
 
 templeton_log_dir = config['configurations']['global']['hcat_log_dir']
 templeton_pid_dir = status_params.templeton_pid_dir


Mime
View raw message