Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 22A8D104DF for ; Thu, 15 Aug 2013 23:56:49 +0000 (UTC) Received: (qmail 73606 invoked by uid 500); 15 Aug 2013 23:56:47 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 73514 invoked by uid 500); 15 Aug 2013 23:56:26 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 73472 invoked by uid 99); 15 Aug 2013 23:56:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 23:56:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 615A0837971; Thu, 15 Aug 2013 23:56:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mahadev@apache.org To: ambari-commits@incubator.apache.org Message-Id: <615588288dd2482183bbdcec86eff4bb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-2924. Oozie setup for 4.0 needs to change depending on if its hadoop 2.0 stack or 1.0 stack. (mahadev) Date: Thu, 15 Aug 2013 23:56:21 +0000 (UTC) Updated Branches: refs/heads/trunk be0c09bed -> 6f644ea59 AMBARI-2924. Oozie setup for 4.0 needs to change depending on if its hadoop 2.0 stack or 1.0 stack. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6f644ea5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6f644ea5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6f644ea5 Branch: refs/heads/trunk Commit: 6f644ea591d2da97c51fc045ac9c2b7530d77a36 Parents: be0c09b Author: Mahadev Konar Authored: Thu Aug 15 16:56:06 2013 -0700 Committer: Mahadev Konar Committed: Thu Aug 15 16:56:09 2013 -0700 ---------------------------------------------------------------------- .../main/puppet/modules/hdp-oozie/manifests/service.pp | 11 ++++++++--- .../stacks/HDP/2.0.5/services/OOZIE/metainfo.xml | 2 +- .../stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6f644ea5/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 433f328..11a6275 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 @@ -38,6 +38,7 @@ class hdp-oozie::service( } else { $ext_js_path = "/usr/share/HDP-oozie/ext.zip" } + $oozie_libext_dir = "/usr/lib/oozie/libext" $lzo_enabled = $hdp::params::lzo_enabled @@ -94,12 +95,16 @@ class hdp-oozie::service( $cmd1 = "cd /usr/lib/oozie && tar -xvf oozie-sharelib.tar.gz" $cmd2 = "cd /usr/lib/oozie && mkdir -p ${oozie_tmp}" - $cmd3 = "cd /usr/lib/oozie && chown ${user}:${hdp::params::user_group} ${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}" + } else { + $cmd3 = "cd /usr/lib/oozie && chown ${user}:${hdp::params::user_group} ${oozie_tmp}" + } if (hdp_get_major_stack_version($hdp::params::stack_version) >= 2) { $cmd4 = $jdbc_driver_name ? { - /(com.mysql.jdbc.Driver|oracle.jdbc.driver.OracleDriver)/ => "cd ${oozie_tmp} && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 2.x /usr/lib/ -extjs $ext_js_path $jar_option $jar_path", - default => "cd ${oozie_tmp} && /usr/lib/oozie/bin/oozie-setup.sh -hadoop 2.x /usr/lib/ -extjs $ext_js_path $jar_option $jar_path", + /(com.mysql.jdbc.Driver|oracle.jdbc.driver.OracleDriver)/ => "cd ${oozie_tmp} && /usr/lib/oozie/bin/oozie-setup.sh prepare-war", + default => "cd ${oozie_tmp} && /usr/lib/oozie/bin/oozie-setup.sh prepare-war", } } else { $cmd4 = $jdbc_driver_name ? { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6f644ea5/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml index affbe85..05e093d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml @@ -18,7 +18,7 @@ root System for workflow coordination and execution of Apache Hadoop jobs - 3.3.2.2.0.5.0 + 4.0.0.2.0.5.0 http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6f644ea5/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml index affbe85..05e093d 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml @@ -18,7 +18,7 @@ root System for workflow coordination and execution of Apache Hadoop jobs - 3.3.2.2.0.5.0 + 4.0.0.2.0.5.0