Refactor params to have less duplication

This introduces variables to make it easier to support multiple
versions.

Author: ekohl

manifests/params.pp

@@ -11,27 +11,23 @@
         'AlmaLinux', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
           # See PR#160 / c8e46b5 for why >= 6.3 < 7.1
           if (versioncmp($facts['os']['release']['full'], '7.1') < 0) {
-            $jdk_package = 'java-1.7.0-openjdk-devel'
-            $jre_package = 'java-1.7.0-openjdk'
-            $java_home   = '/usr/lib/jvm/java-1.7.0/'
-          }
-          else {
-            $jdk_package = 'java-1.8.0-openjdk-devel'
-            $jre_package = 'java-1.8.0-openjdk'
-            $java_home   = '/usr/lib/jvm/java-1.8.0/'
+            $openjdk = '1.7.0'
+          } else {
+            $openjdk = '1.8.0'
           }
+          $jdk_package = "java-${openjdk}-openjdk-devel"
+          $jre_package = "java-${openjdk}-openjdk"
+          $java_home   = "/usr/lib/jvm/java-${openjdk}/"
         }
         'Fedora': {
           if (versioncmp($facts['os']['release']['full'], '21') < 0) {
-            $jdk_package = 'java-1.7.0-openjdk-devel'
-            $jre_package = 'java-1.7.0-openjdk'
-            $java_home   = "/usr/lib/jvm/java-1.7.0-openjdk-${facts['os']['architecture']}/"
-          }
-          else {
-            $jdk_package = 'java-1.8.0-openjdk-devel'
-            $jre_package = 'java-1.8.0-openjdk'
-            $java_home   = "/usr/lib/jvm/java-1.8.0-openjdk-${facts['os']['architecture']}/"
+            $openjdk = '1.7.0'
+          } else {
+            $openjdk = '1.8.0'
           }
+          $jdk_package = "java-${openjdk}-openjdk-devel"
+          $jre_package = "java-${openjdk}-openjdk"
+          $java_home   = "/usr/lib/jvm/java-${openjdk}-openjdk-${facts['os']['architecture']}/"
         }
         'Amazon': {
           $jdk_package = 'java-1.7.0-openjdk-devel'
@@ -63,23 +59,24 @@
       }
       case $facts['os']['release']['major'] {
         '10', '11', '18.04', '18.10', '19.04', '19.10', '20.04', '22.04': {
-          $java = {
-            'jdk' => {
-              'package'          => 'openjdk-11-jdk',
-              'alternative'      => "java-1.11.0-openjdk-${openjdk_architecture}",
-              'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/",
-            },
-            'jre' => {
-              'package'          => 'openjdk-11-jre-headless',
-              'alternative'      => "java-1.11.0-openjdk-${openjdk_architecture}",
-              'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java",
-              'java_home'        => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/",
-            },
-          }
+          $openjdk = 11
         }
         default: { fail("unsupported release ${facts['os']['release']['major']}") }
       }
+      $java = {
+        'jdk' => {
+          'package'          => "openjdk-${openjdk}-jdk",
+          'alternative'      => "java-1.${openjdk}.0-openjdk-${openjdk_architecture}",
+          'alternative_path' => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/bin/java",
+          'java_home'        => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/",
+        },
+        'jre' => {
+          'package'          => "openjdk-${openjdk}-jre-headless",
+          'alternative'      => "java-1.${openjdk}.0-openjdk-${openjdk_architecture}",
+          'alternative_path' => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/bin/java",
+          'java_home'        => "/usr/lib/jvm/java-1.${openjdk}.0-openjdk-${openjdk_architecture}/",
+        },
+      }
     }
     'OpenBSD': {
       $java = {