added openjdk parameters to allow installation of Oracle jdk 7 and 8

dsestero · dsestero · commit b56e0a2b3039 · 2018-07-20T15:12:02.000+02:00
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -10,6 +10,10 @@
 #   Possible values at this time are
 #   <tt>6</tt>, <tt>7</tt>, <tt>8</tt> and <tt>9</tt>.
 #
+# @param openjdk [Boolean] use openjdk. Defaults to <tt>true</tt>.
+#   <tt>true</tt> means to install openjdk from distribution packages
+#   <tt>false</tt> means to untar the Oracle archive.
+#
 # @param java_default_version [Optional[String]] the java default version.
 #   Possible values at this time are
 #   <tt>6</tt>, <tt>7</tt>, <tt>8</tt> and <tt>9</tt>.
@@ -22,12 +26,14 @@
 # @author Dario Sestero
 define java (
   String $java_version                   = $title,
+  Boolean $openjdk                       = true,
   Optional[String] $java_default_version = lookup('java::java_default_version', Optional[String], 'first', undef)) {
 
-  if $facts['os']['family'] == 'Debian' {
+  if $facts['os']['family'] == 'Debian' and $openjdk {
     include apt
   }
   java::install_config { $java_version:
+    openjdk              => $openjdk,
     java_default_version => $java_default_version,
   }
 }
diff --git a/manifests/install_config.pp b/manifests/install_config.pp
@@ -6,6 +6,10 @@
 #   Possible values at this time are
 #   <tt>6</tt> and <tt>7</tt>.
 #
+# @param openjdk [Boolean] use openjdk.
+#   <tt>true</tt> means to install openjdk from distribution packages
+#   <tt>false</tt> means to untar the Oracle archive.
+#
 # @param java_default_version [Optional[String]] the java default version.
 #   Possible values at this time are
 #   <tt>6</tt>, <tt>7>/tt> and <tt>8</tt>.
@@ -19,27 +23,59 @@
 #
 define java::install_config (
   String $java_version = $title,
+  Boolean $openjdk,
   Optional[String] $java_default_version,
 ) {
   case $facts['os']['family'] {
     'Debian' : {
-          $javapkg = "openjdk-${java_version}-jdk"
-          $javadir = "/usr/lib/jvm/java-${java_version}-openjdk-${facts['os']['architecture']}/jre/bin/java"
-          if $facts['os']['release'] in ['12.04', '14.04'] and $java_version == '8' {
-            apt::ppa { 'ppa:openjdk-r/ppa': }
-          }
+      $javapkg = "openjdk-${java_version}-jdk"
+      if $facts['os']['release'] in ['12.04', '14.04'] and $java_version == '8' {
+        apt::ppa { 'ppa:openjdk-r/ppa': }
+      }
     }
     'RedHat' : {
       $javapkg = "java-1.${java_version}.0-openjdk"
-      $javadir = "/usr/lib/jvm/jre-1.${java_version}.0-openjdk.${facts['os']['architecture']}/bin/java"
     }
     default  : {
       fail("The ${module_name} module is not supported on an ${facts['os']['family']} distribution.")
     }
   }
 
-  package { $javapkg:
-    ensure => installed,
+  if $openjdk {
+    package { $javapkg:
+      ensure => installed,
+    }
+    case $facts['os']['family'] {
+      'Debian' : {
+        $javadir = "/usr/lib/jvm/java-${java_version}-openjdk-${facts['os']['architecture']}/jre/bin/java"
+      }
+      'RedHat' : {
+        $javadir = "/usr/lib/jvm/jre-1.${java_version}.0-openjdk.${facts['os']['architecture']}/bin/java"
+      }
+      default  : {
+        fail("The ${module_name} module is not supported on an ${facts['os']['family']} distribution.")
+      }
+    }
+  } else {
+      case $java_version {
+        '7' : {
+          $distribution_name = 'jdk-7u80-linux-x64.tar.gz'
+          $javadir = '/opt/jdk/jdk1.7.0_80'
+        }
+        '8' : {
+          $distribution_name = 'jdk-8u172-linux-x64.tar.gz'
+          $javadir = '/opt/jdk/jdk1.8.0_172'
+        }
+        default  : {
+          fail("The ${module_name} module is not supported for Oracle JDK version ${java_version}.")
+        }
+      }
+     download_uncompress {"dwnl_inst_${java_version}":
+       distribution_name  => $distribution_name,
+       dest_folder   => '/opt/jdk',
+       creates       => $javadir,
+       uncompress    => 'tar.gz',
+     }
   }
 
   if $java_default_version != undef and $java_version == $java_default_version {
diff --git a/metadata.json b/metadata.json
@@ -11,6 +11,10 @@
     {
       "name": "puppetlabs/apt",
       "version_requirement": "2.x"
+    },
+    {
+      "name": "dsestero/download_uncompress",
+      "version_requirement": "1.x"
     }
   ],
   "operatingsystem_support": [

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@`
`11`	`11`	`{`
`12`	`12`	`"name": "puppetlabs/apt",`
`13`	`13`	`"version_requirement": "2.x"`
	`14`	`+ },`
	`15`	`+ {`
	`16`	`+ "name": "dsestero/download_uncompress",`
	`17`	`+ "version_requirement": "1.x"`
`14`	`18`	`}`
`15`	`19`	`],`
`16`	`20`	`"operatingsystem_support": [`