Merge pull request sous-chefs#169 from cwjohnston/retry

carmstrong · carmstrong · commit 824df4e05882 · 2014-04-22T13:15:55.000-07:00
Add retries and retry_delay parameters to java_ark LWRP
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -7,6 +7,10 @@ driver:
 
 provisioner:
   name: chef_solo
+  attributes:
+    java:
+      ark_retries: 2
+      ark_retry_delay: 10
 
 platforms:
   - name: ubuntu-13.10
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -24,6 +24,10 @@
 default['java']['accept_license_agreement'] = false
 default['java']['set_default'] = true
 
+# the following retry parameters apply when downloading oracle java
+default['java']['ark_retries'] = 0
+default['java']['ark_retry_delay'] = 2
+
 case node['platform_family']
 when "windows"
   default['java']['install_flavor'] = "windows"
diff --git a/providers/ark.rb b/providers/ark.rb
@@ -78,7 +78,7 @@ def download_direct_from_oracle(tarball_name, new_resource)
     converge_by(description) do
        Chef::Log.debug "downloading oracle tarball straight from the source"
        cmd = shell_out!(
-                                  %Q[ curl --create-dirs -L --cookie "#{cookie}" #{new_resource.url} -o #{download_path} ]
+                                  %Q[ curl --create-dirs -L --retry #{new_resource.retries} --retry-delay #{new_resource.retry_delay} --cookie "#{cookie}" #{new_resource.url} -o #{download_path} ]
                                )
     end
   else
@@ -123,6 +123,8 @@ def download_direct_from_oracle(tarball_name, new_resource)
       r = remote_file "#{Chef::Config[:file_cache_path]}/#{tarball_name}" do
         source new_resource.url
         checksum new_resource.checksum
+        retries new_resource.retries
+        retry_delay new_resource.retry_delay
         mode 0755
         action :nothing
       end
diff --git a/recipes/oracle.rb b/recipes/oracle.rb
@@ -57,6 +57,8 @@
   app_home java_home
   bin_cmds bin_cmds
   alternatives_priority 1062
+  retries node['java']['ark_retries']
+  retry_delay node['java']['ark_retry_delay']
   action :install
 end
 
diff --git a/recipes/oracle_i386.rb b/recipes/oracle_i386.rb
@@ -56,6 +56,8 @@
   checksum tarball_checksum
   app_home java_home
   bin_cmds bin_cmds
+  retries node['java']['ark_retries']
+  retry_delay node['java']['ark_retries']
   action :install
   default false
 end
diff --git a/resources/ark.rb b/resources/ark.rb
@@ -40,6 +40,8 @@
 attribute :owner, :default => "root"
 attribute :default, :equal_to => [true, false], :default => true
 attribute :alternatives_priority, :kind_of => Integer, :default => 1
+attribute :retries, :kind_of => Integer, :default => 0
+attribute :retry_delay, :kind_of => Integer, :default => 2
 
 # we have to set default for the supports attribute
 # in initializer since it is a 'reserved' attribute name
