Revision b6088261
Added by Ewoud Kohl van Wijngaarden 2 months ago
| manifests/server/install.pp | ||
|---|---|---|
|
install_options => $puppet::package_install_options,
|
||
|
}
|
||
|
|
||
|
# Puppetserver 8 on EL 8 relies on JRE 11 or 17. This prefers JRE 17 by installing it first
|
||
|
if (
|
||
|
!$puppet::server::jvm_java_bin and
|
||
|
$facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' and
|
||
|
# This doesn't use server_version because we have 2 mechanisms to set the version
|
||
|
versioncmp(pick($puppet::server::puppetserver_version, $facts['puppetversion']), '8.0.0') >= 0
|
||
|
) {
|
||
|
# EL 8 packaging can install either Java 17 or Java 11, but we prefer Java 17
|
||
|
stdlib::ensure_packages(['jre-17-headless'])
|
||
|
|
||
|
Package['jre-17-headless'] -> Package[$server_package]
|
||
|
}
|
||
|
|
||
|
if $puppet::server::manage_user {
|
||
|
Package[$server_package] -> User[$puppet::server::user]
|
||
|
}
|
||
Also available in: Unified diff
Fixes #37291 - Use explicit java on RH with Puppetserver 8
The /usr/bin/java file may point to any version. This changes the logic
to determine the java version (unless explicitly specified) dynamically
based on the puppetserver version and the OS.