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

Merge pull request #323 from eimlav/modules7050

Browse Source 
(MODULES-7050) - Fix OracleJDK reinstalling on Puppet runs
This commit is contained in:
Paula Muir
2018-10-03 17:40:50 +01:00
committed by GitHub
parent 72e042afad 89aa846909
commit 615db5f7c6
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/oracle.pp
View File

@@ -119,7 +119,13 @@ define java::oracle (
$release_hash = $url_hash $release_hash = $url_hash
if $release_major =~ /(\d+)u(\d+)/ { if $release_major =~ /(\d+)u(\d+)/ {
$install_path = "${java_se}1.${1}.0_${2}" # Required for CentOS systems where Java8 update number is >= 171 to ensure
# the package is visible to Puppet
if $facts['os']['name'] == 'CentOS' and $2 >= '171' {
$install_path = "${java_se}1.${1}.0_${2}-amd64"
} else {
$install_path = "${java_se}1.${1}.0_${2}"
}
} else { } else {
$install_path = "${java_se}${release_major}${release_minor}" $install_path = "${java_se}${release_major}${release_minor}"
} }