Support specific version and name for Oracle RPM (sous-chefs#184).

carguel · erichelgeson · commit 63ca065f9780 · 2014-08-14T13:25:57.000-05:00
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ Attributes
 See `attributes/default.rb` for default values.
 
 * `node['java']['install_flavor']` - Flavor of JVM you would like
-installed (`oracle`, `openjdk`, `ibm`, `windows`), default `openjdk`
+installed (`oracle`, `oracle_rpm`, `openjdk`, `ibm`, `windows`), default `openjdk`
 on Linux/Unix platforms, `windows` on Windows platforms.
 * `node['java']['jdk_version']` - JDK version to install, defaults to
   `'6'`.
@@ -101,6 +101,13 @@ the .tar.gz.
   JDK/SDK. See the `ibm` recipe section below.
 * `node['java']['ibm']['accept_ibm_download_terms']` - Indicates that
   you accept IBM's EULA (for `java::ibm`)
+* `node['java']['oracle_rpm']['type']` - Type of java RPM (`jre` or `jdk`), default `jdk`
+* `node['java']['oracle_rpm']['package_version']` - optional, can be set 
+  to pin a version different from the up-to-date one available in the YUM repo,
+  it might be needed to also override the node['java']['java_home'] attribute 
+  to a value consistent with the defined version
+* `node['java']['oracle_rpm']['package_name']` - optional, can be set 
+  to define a package name different from the RPM published by Oracle.
 * `node['java']['accept_license_agreement']` - Indicates that you accept
   the EULA for openjdk package installation.
 * `node['java']['set_default']` - Indicates whether or not you want the
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -55,7 +55,19 @@
 
   default['java']['ibm']['7']['bin_cmds'] = node['java']['ibm']['6']['bin_cmds'] + [ "pack200", "unpack200" ]
 when 'oracle_rpm'
+  # type of java RPM : jdk or jre
   default['java']['oracle_rpm']['type'] = 'jdk'
+
+  # optional, can be overriden to pin to a version different
+  # from the up-to-date.
+  default['java']['oracle_rpm']['package_version'] = nil
+
+  # optional, some distros re-package the official Oracle's RPM
+  # with a different name
+  default['java']['oracle_rpm']['package_name'] = nil
+
+  # set the JAVA_HOME path, it may be overriden
+  # when a package version is provided.
   default['java']['java_home'] = "/usr/java/latest"
 end
 
diff --git a/recipes/oracle_rpm.rb b/recipes/oracle_rpm.rb
@@ -50,7 +50,9 @@
 
 end
 
-package node['java']['oracle_rpm']['type']  do
-  action :upgrade
+package_name = node['java']['oracle_rpm']['package_name'] || node['java']['oracle_rpm']['type']
+package package_name  do
+  action :install
+  version node['java']['oracle_rpm']['package_version'] if node['java']['oracle_rpm']['package_version']
   notifies :run, 'bash[update-java-alternatives]', :immediately if platform_family?('rhel', 'fedora') and node['java']['set_default']
 end
