You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/05/16 19:17:51 UTC
svn commit: r1483458 - in /incubator/ambari/trunk: CHANGES.txt
ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
ambari-agent/src/main/puppet/modules/hdp-hive/manifests/params.pp
Author: swagle
Date: Thu May 16 17:17:51 2013
New Revision: 1483458
URL: http://svn.apache.org/r1483458
Log:
AMBARI-2144. Installation with existing Oracle DB fails. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/params.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1483458&r1=1483457&r2=1483458&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 16 17:17:51 2013
@@ -856,6 +856,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2144. Installation with existing Oracle DB fails. (swagle)
+
AMBARI-2143. HBASE fails to start on master. (smohanty
AMBARI-2141. When hbase user is changed hbase does not start properly
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp?rev=1483458&r1=1483457&r2=1483458&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp Thu May 16 17:17:51 2013
@@ -34,7 +34,7 @@ class hdp-hive::jdbc-connector()
}
- if ($hive_ambari_database == "MySQL"){
+ if ($hive_jdbc_driver == "com.mysql.jdbc.Driver"){
hdp::exec { 'hive mkdir -p ${artifact_dir} ; cp /usr/share/java/${jdbc_jar_name} ${target}':
command => "mkdir -p ${artifact_dir} ; cp /usr/share/java/${jdbc_jar_name} ${target}",
unless => "test -f ${target}",
@@ -43,7 +43,7 @@ class hdp-hive::jdbc-connector()
require => Hdp::Package['mysql-connector-java'],
notify => Anchor['hdp-hive::jdbc-connector::end'],
}
- } elsif ($hive_ambari_database == "Oracle") {
+ } elsif ($hive_jdbc_driver == "oracle.jdbc.driver.OracleDriver") {
hdp::exec { 'hive mkdir -p ${artifact_dir} ; cp /usr/share/java/${jdbc_jar_name} ${target}':
command => "mkdir -p ${artifact_dir} ; cp /usr/share/java/${jdbc_jar_name} ${target}",
unless => "test -f ${target}",
Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/params.pp?rev=1483458&r1=1483457&r2=1483458&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hive/manifests/params.pp Thu May 16 17:17:51 2013
@@ -30,9 +30,9 @@ class hdp-hive::params() inherits hdp::p
$hive_user = $hdp::params::hive_user
### JDBC driver jar name
- if ($hive_ambari_database == "MySQL"){
+ if ($hive_jdbc_driver == "com.mysql.jdbc.Driver"){
$jdbc_jar_name = "mysql-connector-java.jar"
- } elsif ($hive_ambari_database == "Oracle") {
+ } elsif ($hive_jdbc_driver == "oracle.jdbc.driver.OracleDriver") {
$jdbc_jar_name = "ojdbc6.jar"
}