svn commit: r1455617 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp/manifests/java/jce/package.pp

[sw...@apache.org]

Author: swagle
Date: Tue Mar 12 16:56:01 2013
New Revision: 1455617

URL: http://svn.apache.org/r1455617
Log:
AMBARI-1603. JCE install on ambari-server fails if /tmp/HDP-artifacts does not exists. (swagle)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/java/jce/package.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1455617&r1=1455616&r2=1455617&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Mar 12 16:56:01 2013
@@ -458,6 +458,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1603. JCE install on ambari-server fails if /tmp/HDP-artifacts does 
+ not exists. (swagle)
+
  AMBARI-1612. Parameterizing nagios and ganglia monitoring rpm version.
  (Ashish Singh via yusaku)
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/java/jce/package.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/java/jce/package.pp?rev=1455617&r1=1455616&r2=1455617&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/java/jce/package.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/java/jce/package.pp Tue Mar 12 16:56:01 2013
@@ -38,11 +38,12 @@ define hdp::java::jce::package(
   #TODO:SUHAS how to avoid redownload and install if correct version already present.
   # may be check the file sizes for local_policy and export_US policy jars? 
   # UNLESS  => "test -e ${java_exec}"
-  $curl_cmd = "curl -f --retry 10 ${jce_location}/${jce_policy_zip} -o ${jce_curl_target}"
+  $curl_cmd = "mkdir -p ${artifact_dir}; curl -f --retry 10 ${jce_location}/${jce_policy_zip} -o ${jce_curl_target}"
   exec{ "jce-download ${name}":
     command => $curl_cmd,
     creates => $jce_curl_target,
     path    => ["/bin","/usr/bin/"],
+    unless => $jce_curl_target
   }
 
   $security_dir = "${java_home_dir}/jre/lib/security"