diff --git a/README.md b/README.md index a293dc6b..d8140393 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,8 @@ See `attributes/default.rb` for default values. deprecated Ubuntu JDK packages from the system, default `false` * `node['java']['install_flavor']` - Flavor of JVM you would like installed (`oracle`, `openjdk`, `ibm`, `windows`), default `openjdk` +* `node['java']['flavor_cookbook']` - The cookbook that contains +the custom flavor you would like to use to install Java. on Linux/Unix platforms, `windows` on Windows platforms. * `node['java']['jdk_version']` - JDK version to install, defaults to `'6'`. diff --git a/attributes/default.rb b/attributes/default.rb index d7f01214..66ef4926 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -22,6 +22,7 @@ # default jdk attributes default['java']['install_flavor'] = "openjdk" +default['java']['flavor_cookbook'] = "java" default['java']['jdk_version'] = '6' default['java']['arch'] = kernel['machine'] =~ /x86_64/ ? "x86_64" : "i586" default['java']['openjdk_packages'] = [] diff --git a/recipes/default.rb b/recipes/default.rb index 574aecde..f48eb7bc 100644 --- a/recipes/default.rb +++ b/recipes/default.rb @@ -18,7 +18,7 @@ # limitations under the License. # -include_recipe "java::#{node['java']['install_flavor']}" +include_recipe "#{node['java']['flavor_cookbook']}::#{node['java']['install_flavor']}" # Purge the deprecated Sun Java packages if remove_deprecated_packages is true %w[sun-java6-jdk sun-java6-bin sun-java6-jre].each do |pkg|