added support for RedHat distributions family and for openjdk-8

dsestero · dsestero · commit 6d3282e4f78e · 2016-11-10T16:34:05.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
-##2016-11-07 - Release - 1.1.0
+##2016-11-10 - Release - 1.1.0
 ###Summary
 Added support for RedHat and CentOS distributions.
+Removed support fo Ubuntu 10.04.
+Removed restriction on specific Ubuntu versions.
+Added java_8.
 
 ##2015-07-12 - Release - 1.0.3
 ###Summary
diff --git a/README.markdown b/README.markdown
@@ -19,7 +19,7 @@ This is the java module. It allows to install Java OpenJDK and configure the def
 
 ##Module Description
 
-The module provides classes and defines to install Java OpenJDK and configure the java alternative on Ubuntu platforms.
+The module provides classes and defines to install Java OpenJDK and configure the java alternative on Debian and RedHat family distributions.
 It allows to install multiple Java versions on the same node.
 
 ##Setup
@@ -36,7 +36,7 @@ The module has no special requirements.
 	
 ###Beginning with java	
 
-The module provides two classes to install Java OpenJDK 6 and 7 respectively. This is done, for example, by declarations as the following:
+The module provides three classes to install Java OpenJDK 6, 7 and 8 respectively. This is done, for example, by declarations as the following:
 
 ```
 include java_7
@@ -64,6 +64,7 @@ It is possible to install multiple versions of Java on a single node and to spec
 
 * [`java::java_6`](#javajava_6): Installs open-jdk-6.
 * [`java::java_7`](#javajava_7): Installs open-jdk-7.
+* [`java::java_8`](#javajava_8): Installs open-jdk-8.
 
 ###Defines
 
@@ -81,6 +82,9 @@ Installs OpenJDK-6 from the repositories.
 ###`java::java_7`
 Installs OpenJDK-7 from the repositories.
 
+###`java::java_8`
+Installs OpenJDK-8 from the repositories.
+
 ###`java::java`
 Install a specific version of java jdk and possibly sets update-alternative default.
 If hiera defines a value for the parameter `java::java_default_version` on
@@ -92,16 +96,16 @@ Declares all other defines in the java module needed for installing Java. Curren
 ####Parameters
 
 #####`java_version`
-Specifies the java version to install. Valid options: '6' or '7'. Defaults to the resource title.
+Specifies the java version to install. Valid options: '6', '7' or '8'. Defaults to the resource title.
 
 #####`java_default_version`
-Specifies the default java in case multiple versions are installed. Valid options: '6' or '7'. Defaults to the hiera defined key `java::java_default_version`.
+Specifies the default java in case multiple versions are installed. Valid options: '6', '7' or '8'. Defaults to the hiera defined key `java::java_default_version`.
 
 ##Limitations
 
-At the moment the module targets only OpenJDK 6 and 7 on Ubuntu, RedHat and CentOS platforms. Specifically, it is tested only on Ubuntu 10.04 and 12.04, CentOS 6.6 distributions; although probably it will work also on more recent versions.
+At the moment the module targets only OpenJDK 6, 7 and 8 on Debian, Ubuntu, RedHat and CentOS platforms. Specifically, it is tested only on Ubuntu 12.04 and CentOS 6.6 distributions; although probably it will work also on different versions.
 
 ##Development
 
-If you need some feature please send me a (pull) request or send me an email at: dsestero 'at' gmail 'dot' com.
+If you need some feature please send me a (pull) request and send me an email at: dsestero 'at' gmail 'dot' com.
 
diff --git a/manifests/install_config.pp b/manifests/install_config.pp
@@ -12,23 +12,12 @@
 # none
 #
 define java::install_config ($java_default_version, $java_version = $title,) {
-  case $::operatingsystem {
-    'Ubuntu'           : {
-      case $::operatingsystemrelease {
-        '10.04' : {
-          $javapkg = "openjdk-${java_version}-jdk"
-          $javadir = "/usr/lib/jvm/java-${java_version}-openjdk/jre/bin/java"
-        }
-        '12.04' : {
+  case osfamily {
+    'Debian' : {
           $javapkg = "openjdk-${java_version}-jdk"
           $javadir = "/usr/lib/jvm/java-${java_version}-openjdk-${::architecture}/jre/bin/java"
-        }
-        default : {
-          fail("The ${module_name} module is not supported on ${::operatingsystem} release ${::operatingsystemrelease}")
-        }
-      }
     }
-    'CentOS', 'RedHat' : {
+    'RedHat' : {
       $javapkg = "java-1.${java_version}.0-openjdk"
       $javadir = "/usr/lib/jvm/jre-1.${java_version}.0-openjdk.${::architecture}/bin/java"
     }
diff --git a/manifests/java_8.pp b/manifests/java_8.pp
@@ -0,0 +1,21 @@
+# Class: java::java_8
+#
+# This class installs Java-8.
+#
+# Parameters:
+#
+# none
+#
+# Actions:
+#
+# Installs Java-8 by declaring the +java+ define.
+#
+# Requires: see Modulefile
+#
+# Sample Usage:
+#
+#  include java::java_8
+class java::java_8 {
+
+  java {'8': }
+}
diff --git a/metadata.json b/metadata.json
@@ -10,8 +10,10 @@
   "requirements": [{"name": "puppet", "version_requirement": ">= 3.0.0"}],
   "operatingsystem_support": [
       {
-          "operatingsystem": "Ubuntu",
-          "operatingsystemrelease": ["10.04", "12.04"]
+          "operatingsystem": "Ubuntu"
+      },
+      {
+          "operatingsystem": "Debian"
       },
       {
           "operatingsystem": "RedHat"

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,10 @@`
`10`	`10`	`"requirements": [{"name": "puppet", "version_requirement": ">= 3.0.0"}],`
`11`	`11`	`"operatingsystem_support": [`
`12`	`12`	`{`
`13`		`- "operatingsystem": "Ubuntu",`
`14`		`- "operatingsystemrelease": ["10.04", "12.04"]`
	`13`	`+ "operatingsystem": "Ubuntu"`
	`14`	`+ },`
	`15`	`+ {`
	`16`	`+ "operatingsystem": "Debian"`
`15`	`17`	`},`
`16`	`18`	`{`
`17`	`19`	`"operatingsystem": "RedHat"`