You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by hi...@apache.org on 2012/06/29 20:26:01 UTC
svn commit: r1355494 - in /incubator/ambari/trunk: CHANGES.txt
hmc/php/puppet/genmanifest/generateManifest.php
hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
hmc/puppet/modules/hdp/manifests/params.pp
Author: hitesh
Date: Fri Jun 29 18:26:00 2012
New Revision: 1355494
URL: http://svn.apache.org/viewvc?rev=1355494&view=rev
Log:
AMBARI-585. Remove hardcoded dependency on mysql-connector-java package version 5.0.8-1 (Contributed by Hitesh)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/hmc/php/puppet/genmanifest/generateManifest.php
incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1355494&r1=1355493&r2=1355494&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Jun 29 18:26:00 2012
@@ -6,6 +6,9 @@ characters wide.
Release 1.0.0 - unreleased
+ AMBARI-585. Remove hardcoded dependency on mysql-connector-java package
+ version 5.0.8-1 (hitesh)
+
AMBARI-581. Strip carriage-return related control-chars from hosts files
(Jaimin Jetly via hitesh)
Modified: incubator/ambari/trunk/hmc/php/puppet/genmanifest/generateManifest.php
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/php/puppet/genmanifest/generateManifest.php?rev=1355494&r1=1355493&r2=1355494&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/php/puppet/genmanifest/generateManifest.php (original)
+++ incubator/ambari/trunk/hmc/php/puppet/genmanifest/generateManifest.php Fri Jun 29 18:26:00 2012
@@ -233,8 +233,8 @@ include "RoleDependencies.php";
"hdp-hbase::regionserver" => array("hbase"),
"hdp-hbase::client" => array("hbase"),
"hdp-pig" => array("pig.noarch"),
- "hdp-sqoop" => array("sqoop", "mysql-connector-java-5.0.8-1"),
- "hdp-hive::server" => array("hive", "mysql-connector-java-5.0.8-1"),
+ "hdp-sqoop" => array("sqoop", "mysql-connector-java"),
+ "hdp-hive::server" => array("hive", "mysql-connector-java"),
"hdp-hive::client" => array("hive"),
"hdp-hcat" => array("hcatalog"),
"hdp-oozie::server" => array("oozie.noarch", "extjs-2.2-1"),
Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp?rev=1355494&r1=1355493&r2=1355494&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp Fri Jun 29 18:26:00 2012
@@ -8,9 +8,9 @@ class hdp-sqoop::mysql-connector()
anchor { 'hdp-sqoop::mysql-connector::begin':}
- hdp::exec { 'yum install -y mysql-connector-java-5.0.8-1':
- command => "yum install -y mysql-connector-java-5.0.8-1",
- unless => "rpm -qa | grep mysql-connector-java-5.0.8-1",
+ hdp::exec { 'yum install -y mysql-connector-java':
+ command => "yum install -y mysql-connector-java",
+ unless => "rpm -qa | grep mysql-connector-java",
path => ["/bin","/usr/bin/"],
require => Anchor['hdp-sqoop::mysql-connector::begin']
}
@@ -20,7 +20,7 @@ class hdp-sqoop::mysql-connector()
unless => "test -f ${target}",
creates => $target,
path => ["/bin","/usr/bin/"],
- require => Hdp::Exec['yum install -y mysql-connector-java-5.0.8-1'],
+ require => Hdp::Exec['yum install -y mysql-connector-java'],
notify => Anchor['hdp-sqoop::mysql-connector::end'],
}
Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp?rev=1355494&r1=1355493&r2=1355494&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp/manifests/params.pp Fri Jun 29 18:26:00 2012
@@ -239,7 +239,7 @@ class hdp::params()
32 => ['mysql','mysql-server']
},
mysql-connector => {
- 64 => ['mysql-connector-java-5.0.8-1']
+ 64 => ['mysql-connector-java']
},
extjs => {
64 => ['extjs-2.2-1']