Browse Source

AMBARI-2564. Ambari agents can't download ojdbc6.jar via https. (Dmytro Sh via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1499812 13f79535-47bb-0310-9956-ffa450edef68
Mahadev Konar 12 years ago
parent
commit
d43d7ad1fa

+ 2 - 2
ambari-agent/src/main/puppet/modules/hdp-hadoop/manifests/init.pp

@@ -282,9 +282,9 @@ class hdp-hadoop(
     $mysql_driver_url = $hdp::params::mysql_jdbc_url
 
     if ($server_db_name == 'oracle' and $oracle_driver_url != "") {
-      $db_driver_dload_cmd = "curl -f --retry 5 $oracle_driver_url -o ${hadoop_lib_home}/${db_driver_filename}"
+      $db_driver_dload_cmd = "curl -kf --retry 5 $oracle_driver_url -o ${hadoop_lib_home}/${db_driver_filename}"
     } elsif ($server_db_name == 'mysql' and $mysql_driver_url != "") {
-      $db_driver_dload_cmd = "curl -f --retry 5 $mysql_driver_url -o ${hadoop_lib_home}/${db_driver_filename}"
+      $db_driver_dload_cmd = "curl -kf --retry 5 $mysql_driver_url -o ${hadoop_lib_home}/${db_driver_filename}"
     }
     if ($db_driver_dload_cmd != undef) {
       exec { '${db_driver_dload_cmd}':

+ 2 - 2
ambari-agent/src/main/puppet/modules/hdp-hive/manifests/jdbc-connector.pp

@@ -49,8 +49,8 @@ class hdp-hive::jdbc-connector()
        before  =>  Anchor['hdp-hive::jdbc-connector::end'],
    }
   } elsif ($hive_jdbc_driver == "oracle.jdbc.driver.OracleDriver") {
-   hdp::exec { 'hive mkdir -p ${artifact_dir} ; curl -f --retry 10 ${driver_curl_source} -o ${driver_curl_target} &&  cp ${driver_curl_target} ${target}':
-       command => "mkdir -p ${artifact_dir} ; curl -f --retry 10 ${driver_curl_source} -o ${driver_curl_target} &&  cp ${driver_curl_target} ${target}",
+   hdp::exec { 'hive mkdir -p ${artifact_dir} ; curl -kf --retry 10 ${driver_curl_source} -o ${driver_curl_target} &&  cp ${driver_curl_target} ${target}':
+       command => "mkdir -p ${artifact_dir} ; curl -kf --retry 10 ${driver_curl_source} -o ${driver_curl_target} &&  cp ${driver_curl_target} ${target}",
        unless  => "test -f ${target}",
        path    => ["/bin","/usr/bin/"],
        before  =>  Anchor['hdp-hive::jdbc-connector::end'],

+ 1 - 1
ambari-agent/src/main/puppet/modules/hdp-oozie/manifests/service.pp

@@ -45,7 +45,7 @@ class hdp-oozie::service(
   $artifact_dir = $hdp::params::artifact_dir
   $driver_location = $hdp::params::jdk_location
   $driver_curl_target = "${java_share_dir}/${oracle_driver_jar_name}"
-  $curl_cmd = "curl -f --retry 10 ${driver_location}${oracle_driver_jar_name} -o ${driver_curl_target}"
+  $curl_cmd = "curl -kf --retry 10 ${driver_location}${oracle_driver_jar_name} -o ${driver_curl_target}"
   
   $jdbc_driver_name = $configuration['oozie-site']['oozie.service.JPAService.jdbc.driver']
   if ($jdbc_driver_name == "com.mysql.jdbc.Driver"){