Merge pull request #140 from cantenesse/control_default

added support to determine whether to set installed java version to defa...
sous-chefs · Feb 24, 2014 · 3258352 · 3258352
2 parents c076f8c + 9d6d4b9
commit 3258352
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -22,6 +22,7 @@
 default['java']['arch'] = kernel['machine'] =~ /x86_64/ ? "x86_64" : "i586"
 default['java']['openjdk_packages'] = []
 default['java']['accept_license_agreement'] = false
+default['java']['set_default'] = true
 
 case node['platform_family']
 when "windows"

diff --git a/recipes/ibm.rb b/recipes/ibm.rb
@@ -52,6 +52,7 @@
 
 java_alternatives 'set-java-alternatives' do
   java_location node['java']['java_home']
+  default node['java']['set_default']
   case node['java']['jdk_version'].to_s
   when "6"
     bin_cmds node['java']['ibm']['6']['bin_cmds']

diff --git a/recipes/ibm_tar.rb b/recipes/ibm_tar.rb
@@ -50,6 +50,7 @@
 
 java_alternatives 'set-java-alternatives' do
   java_location node['java']['java_home']
+  default node['java']['set_default']
   case node['java']['jdk_version'].to_s
   when "6"
     bin_cmds node['java']['ibm']['6']['bin_cmds']

diff --git a/recipes/openjdk.rb b/recipes/openjdk.rb
@@ -49,6 +49,7 @@
 if platform_family?('debian', 'rhel', 'fedora')
   java_alternatives 'set-java-alternatives' do
     java_location jdk.java_home
+    default node['java']['set_default']
     priority jdk.alternatives_priority
     case node['java']['jdk_version'].to_s
     when "6"

diff --git a/recipes/oracle.rb b/recipes/oracle.rb
@@ -48,6 +48,7 @@
 
 java_ark "jdk" do
   url tarball_url
+  default node['java']['set_default']
   checksum tarball_checksum
   app_home java_home
   bin_cmds bin_cmds

diff --git a/recipes/oracle_i386.rb b/recipes/oracle_i386.rb
@@ -48,6 +48,7 @@
 
 java_ark "jdk-alt" do
   url tarball_url
+  default node['java']['set_default']
   checksum tarball_checksum
   app_home java_home
   bin_cmds bin_cmds

diff --git a/recipes/oracle_rpm.rb b/recipes/oracle_rpm.rb
@@ -31,7 +31,7 @@
                Chef::Application.fatal "Unsupported oracle RPM type (#{node['java']['oracle_rpm']['type']})"
              end
 
-if platform_family?('rhel', 'fedora')
+if platform_family?('rhel', 'fedora') and node['java']['set_default']
 
   bash 'update-java-alternatives' do
     java_home = node['java']['java_home']
@@ -52,5 +52,5 @@
 
 package node['java']['oracle_rpm']['type']  do
   action :upgrade
-  notifies :run, 'bash[update-java-alternatives]', :immediately if platform_family?('rhel', 'fedora')
+  notifies :run, 'bash[update-java-alternatives]', :immediately if platform_family?('rhel', 'fedora') and node['java']['set_default']
 end