Updated Branches: refs/heads/trunk 18ab34207 -> 8a7a639c6
AMBARI-2949. oozie server does not start with custom db. (smohanty) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/8a7a639c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/8a7a639c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/8a7a639c Branch: refs/heads/trunk Commit: 8a7a639c6920c4e016920eacca9b3f604af4e5ce Parents: 18ab342 Author: Sumit Mohanty <[email protected]> Authored: Mon Aug 19 00:11:26 2013 -0700 Committer: Sumit Mohanty <[email protected]> Committed: Mon Aug 19 08:36:14 2013 -0700 ---------------------------------------------------------------------- .../src/main/puppet/modules/hdp-oozie/manifests/service.pp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/8a7a639c/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp index 11a6275..aea0016 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp @@ -96,7 +96,10 @@ class hdp-oozie::service( $cmd1 = "cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz" $cmd2 = "cd /usr/lib/oozie && mkdir -p ${oozie_tmp}" if (hdp_get_major_stack_version($hdp::params::stack_version) >= 2) { - $cmd3 = "cd /usr/lib/oozie && chown ${user}:${hdp::params::user_group} ${oozie_tmp} && mkdir -p ${oozie_libext_dir} && cp ${$ext_js_path} ${oozie_libext_dir}" + $cmd3 = $jdbc_driver_name ? { + /(com.mysql.jdbc.Driver|oracle.jdbc.driver.OracleDriver)/ => "cd /usr/lib/oozie && chown ${user}:${hdp::params::user_group} ${oozie_tmp} && mkdir -p ${oozie_libext_dir} && cp ${$ext_js_path} ${oozie_libext_dir} && cp ${$jdbc_driver_jar} ${oozie_libext_dir}", + default => "cd /usr/lib/oozie && chown ${user}:${hdp::params::user_group} ${oozie_tmp} && mkdir -p ${oozie_libext_dir} && cp ${$ext_js_path} ${oozie_libext_dir}", + } } else { $cmd3 = "cd /usr/lib/oozie && chown ${user}:${hdp::params::user_group} ${oozie_tmp}" }
