You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vi...@apache.org on 2012/06/07 05:46:15 UTC
svn commit: r1347366 - in /incubator/ambari/branches/ambari-186: ./
hmc/puppet/modules/hdp-hive/manifests/
hmc/puppet/modules/hdp-oozie/manifests/
hmc/puppet/modules/hdp-sqoop/manifests/
hmc/puppet/modules/hdp-templeton/manifests/ hmc/puppet/modules/hd...
Author: vikram
Date: Thu Jun 7 03:46:14 2012
New Revision: 1347366
URL: http://svn.apache.org/viewvc?rev=1347366&view=rev
Log:
AMBARI-513. Patch to fix previous patch (Contributed by Ramya)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/mysql-connector.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-oozie/manifests/download-ext-zip.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp
incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347366&r1=1347365&r2=1347366&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun 7 03:46:14 2012
@@ -6,6 +6,8 @@ characters wide.
Release 0.1.x - unreleased
+ AMBARI-513. Fix for previous patch (Ramya via Vikram)
+
AMBARI-515. Modules tar size increases. (Jitendra via Vikram)
AMBARI-514. Fix parsing error in puppet manifests. (Mahadev via Vikram)
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/mysql-connector.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/mysql-connector.pp?rev=1347366&r1=1347365&r2=1347366&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/mysql-connector.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-hive/manifests/mysql-connector.pp Thu Jun 7 03:46:14 2012
@@ -7,7 +7,7 @@ class hdp-hive::mysql-connector()
anchor { 'hdp-hive::mysql-connector::begin':}
- hdp::package { 'mysql-connector-java-5.0.8-4.jpp5' :
+ hdp::package { 'mysql-connector' :
require => Anchor['hdp-hive::mysql-connector::begin']
}
@@ -16,7 +16,7 @@ class hdp-hive::mysql-connector()
unless => "test -f ${target}",
creates => $target,
path => ["/bin","/usr/bin/"],
- require => Hdp::Package['mysql-connector-java-5.0.8-4.jpp5'],
+ require => Hdp::Package['mysql-connector'],
notify => Anchor['hdp-hive::mysql-connector::end'],
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-oozie/manifests/download-ext-zip.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-oozie/manifests/download-ext-zip.pp?rev=1347366&r1=1347365&r2=1347366&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-oozie/manifests/download-ext-zip.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-oozie/manifests/download-ext-zip.pp Thu Jun 7 03:46:14 2012
@@ -7,7 +7,7 @@ class hdp-oozie::download-ext-zip()
anchor { 'hdp-oozie::download-ext-zip::begin':}
- hdp::package { 'extjs-2.2-1' :
+ hdp::package { 'extjs' :
require => Anchor['hdp-oozie::download-ext-zip::begin']
}
@@ -16,7 +16,7 @@ class hdp-oozie::download-ext-zip()
unless => "test -f ${target}",
creates => $target,
path => ["/bin","/usr/bin/"],
- require => Hdp::Package['extjs-2.2-1'],
+ require => Hdp::Package['extjs'],
notify => Anchor['hdp-oozie::download-ext-zip::end'],
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp?rev=1347366&r1=1347365&r2=1347366&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp Thu Jun 7 03:46:14 2012
@@ -8,7 +8,7 @@ class hdp-sqoop::mysql-connector()
anchor { 'hdp-sqoop::mysql-connector::begin':}
- hdp::exec { 'yum install -y mysql-connector-java-5.0.8-4.jpp5'
+ hdp::exec { 'yum install -y mysql-connector-java-5.0.8-4.jpp5':
command => "yum install -y mysql-connector-java-5.0.8-4.jpp5",
unless => "rpm -qa | grep mysql-connector-java-5.0.8-4.jpp5",
path => ["/bin","/usr/bin/"],
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp?rev=1347366&r1=1347365&r2=1347366&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp Thu Jun 7 03:46:14 2012
@@ -8,7 +8,7 @@ class hdp-templeton::download-hive-tar()
anchor { 'hdp-templeton::download-hive-tar::begin':}
- hdp::package { 'templeton-tar-hive-0.0.1-1' :
+ hdp::package { 'templeton-tar-hive' :
require => Anchor['hdp-templeton::download-hive-tar::begin']
}
@@ -17,7 +17,7 @@ class hdp-templeton::download-hive-tar()
unless => "test -f ${target}",
creates => $target,
path => ["/bin","/usr/bin/"],
- require => Hdp::Package['templeton-tar-hive-0.0.1-1'],
+ require => Hdp::Package['templeton-tar-hive'],
notify => Anchor['hdp-templeton::download-hive-tar::end'],
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp?rev=1347366&r1=1347365&r2=1347366&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp Thu Jun 7 03:46:14 2012
@@ -8,7 +8,7 @@ class hdp-templeton::download-pig-tar()
anchor { 'hdp-templeton::download-pig-tar::begin':}
- hdp::package { 'templeton-tar-pig-0.0.1-1' :
+ hdp::package { 'templeton-tar-pig' :
require => Anchor['hdp-templeton::download-pig-tar::begin']
}
@@ -17,7 +17,7 @@ class hdp-templeton::download-pig-tar()
unless => "test -f ${target}",
creates => $target,
path => ["/bin","/usr/bin/"],
- require => Hdp::Package['templeton-tar-pig-0.0.1-1'],
+ require => Hdp::Package['templeton-tar-pig'],
notify => Anchor['hdp-templeton::download-pig-tar::end'],
}
Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp?rev=1347366&r1=1347365&r2=1347366&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp/manifests/params.pp Thu Jun 7 03:46:14 2012
@@ -214,6 +214,18 @@ class hdp::params()
},
mysql => {
32 => ['mysql','mysql-server']
+ },
+ mysql-connector => {
+ 64 => ['mysql-connector-java-5.0.8-4.jpp5']
+ },
+ extjs => {
+ 64 => ['extjs-2.2-1']
+ },
+ templeton-tar-hive => {
+ 64 => ['templeton-tar-hive-0.0.1-1']
+ },
+ templeton-tar-pig => {
+ 64 => ['templeton-tar-pig-0.0.1-1']
}
}
$packages = 'bigtop'