浏览代码

AMBARI-511. Fix for previous patch. (Contributed by Jitendra)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1347368 13f79535-47bb-0310-9956-ffa450edef68
Vikram Dixit K 13 年之前
父节点
当前提交
9fff917731

+ 2 - 0
CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-511. Fix for previous patch (Jitendra via Vikram)
+
   AMBARI-516. Fix epel install to be using curl calls. (Mahadev via Vikram)
 
   AMBARI-513. Fix for previous patch (Ramya via Vikram)

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

@@ -213,8 +213,8 @@ include "RoleDependencies.php";
      "hdp-hbase::regionserver" => "hbase",
      "hdp-hbase::client" => "hbase",
      "hdp-pig" => "pig.noarch",
-     "hdp-sqoop" => "sqoop mysql-connector-java-5.0.8-4.jpp5",
-     "hdp-hive::server" => "hive mysql-connector-java-5.0.8-4.jpp5",
+     "hdp-sqoop" => "sqoop mysql-connector-java-5.0.8-1",
+     "hdp-hive::server" => "hive mysql-connector-java-5.0.8-1",
      "hdp-hive::client" => "hive",
      "hdp-hcat" => "hcatalog",
      "hdp-oozie::server" => "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-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",
+   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",
        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-4.jpp5'],
+       require => Hdp::Exec['yum install -y mysql-connector-java-5.0.8-1'],
        notify  =>  Anchor['hdp-sqoop::mysql-connector::end'],
    }
 

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

@@ -216,7 +216,7 @@ class hdp::params()
       32 =>  ['mysql','mysql-server']
   },
     mysql-connector => {
-      64 =>  ['mysql-connector-java-5.0.8-4.jpp5']
+      64 =>  ['mysql-connector-java-5.0.8-1']
   },
     extjs => {
       64 =>  ['extjs-2.2-1']