Browse Source

AMBARI-585. Remove hardcoded dependency on mysql-connector-java package version 5.0.8-1 (Contributed by Hitesh)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1355494 13f79535-47bb-0310-9956-ffa450edef68
Hitesh Shah 13 years ago
parent
commit
53060ecc80

+ 3 - 0
CHANGES.txt

@@ -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)
 

+ 2 - 2
hmc/php/puppet/genmanifest/generateManifest.php

@@ -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"),

+ 4 - 4
hmc/puppet/modules/hdp-sqoop/manifests/mysql-connector.pp

@@ -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'],
    }
 

+ 1 - 1
hmc/puppet/modules/hdp/manifests/params.pp

@@ -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']