Skip to content

Replace legacy facts by modern facts #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daianamezdrea merged 1 commit into from
Feb 11, 2020
Merged

Replace legacy facts by modern facts #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/alternative.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class { 'java':
package => 'jdk-8u25-linux-x64',
java_alternative => 'jdk1.8.0_25',
java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java'
java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java',
}
4 changes: 2 additions & 2 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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':
Expand All @@ -26,7 +26,7 @@
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'],
}
}

Expand Down
10 changes: 5 additions & 5 deletions manifests/download.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
) {

# archive module is used to download the java package
include ::archive
include archive

# validate java Standard Edition to download
if $java_se !~ /(jre|jdk)/ {
Expand Down Expand Up @@ -183,7 +183,7 @@

# set java architecture nomenclature
$os_architecture = $facts['os']['architecture'] ? {
undef => $facts['architecture'],
undef => $facts['os']['architecture'],
default => $facts['os']['architecture']
}

Expand Down Expand Up @@ -284,14 +284,14 @@
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}"],
}
}

Expand All @@ -312,7 +312,7 @@
require => [
Package['unzip'],
Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
]
],
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
$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.")
}
Expand All @@ -111,7 +111,7 @@
default => '--jre'
}

if $::osfamily == 'Debian' {
if $facts['os']['family'] == 'Debian' {
# Needed for update-java-alternatives
package { 'java-common':
ensure => present,
Expand Down
48 changes: 24 additions & 24 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Expand All @@ -34,23 +34,23 @@
}
}
'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' => {
Expand All @@ -64,16 +64,16 @@
}
}
'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' => {
Expand All @@ -84,7 +84,7 @@
},
'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}/",
},
Expand Down Expand Up @@ -139,7 +139,7 @@
'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': {
Expand All @@ -155,10 +155,10 @@
'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': {
Expand Down Expand Up @@ -198,17 +198,17 @@
}
}
'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/'
Expand Down Expand Up @@ -255,6 +255,6 @@
},
}
}
default: { fail("unsupported platform ${::osfamily}") }
default: { fail("unsupported platform ${facts['os']['family']}") }
}
}
Loading