RickRongen/puppetlabs-java
1
0
Fork 0
Code Releases Activity

Replace legacy facts by modern facts

Browse Source 
Fix minor puppet-lint issues.
This commit is contained in:
Hubert de Heer
2020-02-03 13:24:27 +01:00
parent c4c56cd6c5
commit 93cc972768
6 changed files with 92 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/config.pp
View File

@@ -1,6 +1,6 @@
# @api private
class java::config ( ) {
case $::osfamily {
case $facts['os']['family'] {
'Debian': {
if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef {
exec { 'update-java-alternatives':
@@ -26,7 +26,7 @@ class java::config ( ) {
path => '/usr/bin:/usr/sbin:/bin:/sbin',
command => "alternatives --install /usr/bin/java java ${$java::use_java_alternative_path} 20000" ,
unless => "alternatives --display java | grep -q ${$java::use_java_alternative_path}",
before => Exec['update-java-alternatives']
before => Exec['update-java-alternatives'],
}
}

10
manifests/download.pp
View File

@@ -72,7 +72,7 @@ define java::download(
) {
# archive module is used to download the java package
include ::archive
include archive
# validate java Standard Edition to download
if $java_se !~ /(jre|jdk)/ {
@@ -183,7 +183,7 @@ define java::download(
# set java architecture nomenclature
$os_architecture = $facts['os']['architecture'] ? {
undef => $facts['architecture'],
undef => $facts['os']['architecture'],
default => $facts['os']['architecture']
}
@@ -284,14 +284,14 @@ define java::download(
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
command => $install_command,
creates => $creates_path,
require => $install_requires
require => $install_requires,
}
if ($manage_symlink and $symlink_name) {
file { "${_basedir}/${symlink_name}":
ensure => link,
target => $creates_path,
require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"],
}
}
@@ -312,7 +312,7 @@ define java::download(
require => [
Package['unzip'],
Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
]
],
}
}
}

4
manifests/init.pp
View File

@@ -101,7 +101,7 @@ class java(
$use_java_package_name == undef or $use_java_alternative == undef or
$use_java_alternative_path == undef or $use_java_home == undef
) and (
! has_key($::java::params::java, $distribution)
! has_key($java::params::java, $distribution)
)) {
fail("Java distribution ${distribution} is not supported. Missing default values.")
}
@@ -111,7 +111,7 @@ class java(
default => '--jre'
}
if $::osfamily == 'Debian' {
if $facts['os']['family'] == 'Debian' {
# Needed for update-java-alternatives
package { 'java-common':
ensure => present,

48
manifests/params.pp
View File

@@ -6,23 +6,23 @@
# @api private
class java::params {
case $::osfamily {
case $facts['os']['family'] {
'RedHat': {
case $::operatingsystem {
case $facts['os']['name'] {
'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
if (versioncmp($::operatingsystemrelease, '5.0') < 0) {
if (versioncmp($facts['os']['release']['full'], '5.0') < 0) {
$jdk_package = 'java-1.6.0-sun-devel'
$jre_package = 'java-1.6.0-sun'
$java_home = '/usr/lib/jvm/java-1.6.0-sun/jre/'
}
# See cde7046 for why >= 5.0 < 6.3
elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) {
elsif (versioncmp($facts['os']['release']['full'], '6.3') < 0) {
$jdk_package = 'java-1.6.0-openjdk-devel'
$jre_package = 'java-1.6.0-openjdk'
$java_home = '/usr/lib/jvm/java-1.6.0/'
}
# See PR#160 / c8e46b5 for why >= 6.3 < 7.1
elsif (versioncmp($::operatingsystemrelease, '7.1') < 0) {
elsif (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/'
@@ -34,23 +34,23 @@ class java::params {
}
}
'Fedora': {
if (versioncmp($::operatingsystemrelease, '21') < 0) {
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-${::architecture}/"
$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-${::architecture}/"
$java_home = "/usr/lib/jvm/java-1.8.0-openjdk-${facts['os']['architecture']}/"
}
}
'Amazon': {
$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-${::architecture}/"
$java_home = "/usr/lib/jvm/java-1.7.0-openjdk-${facts['os']['architecture']}/"
}
default: { fail("unsupported os ${::operatingsystem}") }
default: { fail("unsupported os ${facts['os']['name']}") }
}
$java = {
'jdk' => {
@@ -64,16 +64,16 @@ class java::params {
}
}
'Debian': {
$oracle_architecture = $::architecture ? {
$oracle_architecture = $facts['os']['architecture'] ? {
'amd64' => 'x64',
default => $::architecture
default => $facts['os']['architecture']
}
$openjdk_architecture = $::architecture ? {
$openjdk_architecture = $facts['os']['architecture'] ? {
'aarch64' => 'arm64',
'armv7l' => 'armhf',
default => $::architecture
default => $facts['os']['architecture']
}
case $::operatingsystemmajrelease {
case $facts['os']['release']['major'] {
'7', '8', '14.04': {
$java = {
'jdk' => {
@@ -84,7 +84,7 @@ class java::params {
},
'jre' => {
'package' => 'openjdk-7-jre-headless',
'alternative' => "java-1.7.0-openjdk-${::architecture}",
'alternative' => "java-1.7.0-openjdk-${facts['os']['architecture']}",
'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.7.0-openjdk-${openjdk_architecture}/",
},
@@ -139,7 +139,7 @@ class java::params {
'alternative' => "java-1.8.0-openjdk-${openjdk_architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
}
},
}
}
'10', '18.04', '18.10', '19.04', '19.10': {
@@ -155,10 +155,10 @@ class java::params {
'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}/",
}
},
}
}
default: { fail("unsupported release ${::operatingsystemmajrelease}") }
default: { fail("unsupported release ${facts['os']['release']['major']}") }
}
}
'OpenBSD': {
@@ -198,17 +198,17 @@ class java::params {
}
}
'Suse': {
case $::operatingsystem {
case $facts['os']['name'] {
'SLES': {
if (versioncmp($::operatingsystemrelease, '12.1') >= 0) {
if (versioncmp($facts['os']['release']['full'], '12.1') >= 0) {
$jdk_package = 'java-1_8_0-openjdk-devel'
$jre_package = 'java-1_8_0-openjdk'
$java_home = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/'
} elsif (versioncmp($::operatingsystemrelease, '12') >= 0) {
} elsif (versioncmp($facts['os']['release']['full'], '12') >= 0) {
$jdk_package = 'java-1_7_0-openjdk-devel'
$jre_package = 'java-1_7_0-openjdk'
$java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
} elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
} elsif (versioncmp($facts['os']['release']['full'], '11.4') >= 0) {
$jdk_package = 'java-1_7_1-ibm-devel'
$jre_package = 'java-1_7_1-ibm'
$java_home = '/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/'
@@ -255,6 +255,6 @@ class java::params {
},
}
}
default: { fail("unsupported platform ${::osfamily}") }
default: { fail("unsupported platform ${facts['os']['family']}") }
}
}