AMBARI-513. (Contributed by Ramya)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1347363 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-513. Download mysql rpm for sqoop (Ramya via Vikram)
+
   AMBARI-511. Fix for the previous 511 patch.
 
   AMBARI-512. Fix puppet manifests for tarball downloads via rpms. (Mahadev via Vikram)

hmc/puppet/modules/hdp-hive/manifests/mysql-connector.pp

@@ -11,7 +11,7 @@ class hdp-hive::mysql-connector()
      require   => Anchor['hdp-hive::mysql-connector::begin']
    }
 
-   hdp::exec { 'mkdir -p ${artifact_dir} ;  cp /usr/share/java/mysql-connector-java.jar  ${target}':
+   hdp::exec { 'hive mkdir -p ${artifact_dir} ;  cp /usr/share/java/mysql-connector-java.jar  ${target}':
        command => "mkdir -p ${artifact_dir} ;  cp /usr/share/java/mysql-connector-java.jar  ${target}",
        unless  => "test -f ${target}",
        creates => $target,

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

@@ -3,26 +3,27 @@ class hdp-sqoop::mysql-connector()
   include hdp-sqoop::params
   include hdp-hive::params
 
-  $url = $hdp-hive::params::mysql_connector_url
-  notice($url)
-  $zip_name = regsubst($url,'^.+/([^/]+$)','\1')
-  $jar_name = regsubst($zip_name,'zip$','.jar')
   $target = "${hdp::params::artifact_dir}/${zip_name}"
   $sqoop_lib = $hdp-sqoop::params::sqoop_lib
-  
-  exec{ "curl sqoop_mysql_url":
-    command => "mkdir -p ${artifact_dir} ; curl -f --retry 10 ${url} -o ${target} ",
-    creates => $target,
-    path    => ["/bin","/usr/bin/"]
-  }
-  exec{ "unzip sqoop_mysql_url":
-    command => "unzip -o -j ${target}",
-    cwd     => $sqoop_lib,
-    #user    => $hdp::params::sqoop_user,
-    group   => $hdp::params::hadoop_user_group,
-    creates => "${sqoop_lib}/${$zip_name}",
-    path    => ["/usr/bin/"]
-  }
 
-  Exec["curl sqoop_mysql_url"] -> Exec["unzip sqoop_mysql_url"]
+  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",
+       path    => ["/bin","/usr/bin/"],
+       require   => Anchor['hdp-sqoop::mysql-connector::begin']
+   }
+
+   hdp::exec { 'sqoop mkdir -p ${artifact_dir} ;  cp /usr/share/java/mysql-connector-java.jar  ${target}':
+       command => "mkdir -p ${artifact_dir} ;  cp /usr/share/java/mysql-connector-java.jar  ${target}",
+       unless  => "test -f ${target}",
+       creates => $target,
+       path    => ["/bin","/usr/bin/"],
+       require => Hdp::Exec['yum install -y mysql-connector-java-5.0.8-4.jpp5'],
+       notify  =>  Anchor['hdp-sqoop::mysql-connector::end'],
+   }
+
+   anchor { 'hdp-sqoop::mysql-connector::end':}
+  
 }

hmc/puppet/modules/hdp-templeton/manifests/download-hive-tar.pp

@@ -12,11 +12,11 @@ class hdp-templeton::download-hive-tar()
      require   => Anchor['hdp-templeton::download-hive-tar::begin']                                                              
    }
   
-   hdp::exec { 'mkdir -p ${artifact_dir} ;  cp /tmp/HDP-templeton/${src_tar_name} ${target}':
+   hdp::exec { 'hive mkdir -p ${artifact_dir} ;  cp /tmp/HDP-templeton/${src_tar_name} ${target}':
        command => "mkdir -p ${artifact_dir} ;  cp /tmp/HDP-templeton/${src_tar_name} ${target}",
        unless  => "test -f ${target}",
        creates => $target,
-       path    => ["/bin","/usr/bin/"],
+       path    => ["/bin","/usr/bin/"]
        require => Hdp::Package['templeton-tar-hive-0.0.1-1'],
        notify  =>  Anchor['hdp-templeton::download-hive-tar::end'],
    }

hmc/puppet/modules/hdp-templeton/manifests/download-pig-tar.pp

@@ -12,11 +12,11 @@ class hdp-templeton::download-pig-tar()
      require   => Anchor['hdp-templeton::download-pig-tar::begin']
    }
 
-   hdp::exec { 'mkdir -p ${artifact_dir} ;  cp /tmp/HDP-templeton/${src_tar_name} ${target}':
+   hdp::exec { 'pig ; mkdir -p ${artifact_dir} ;  cp /tmp/HDP-templeton/${src_tar_name} ${target}':
        command => "mkdir -p ${artifact_dir} ;  cp /tmp/HDP-templeton/${src_tar_name} ${target}",
        unless  => "test -f ${target}",
        creates => $target,
-       path    => ["/bin","/usr/bin/"],
+       path    => ["/bin","/usr/bin/"]
        require => Hdp::Package['templeton-tar-pig-0.0.1-1'],
        notify  =>  Anchor['hdp-templeton::download-pig-tar::end'],
    }