Skip to content

Commit ce5b97b

Browse files
author
John Duarte
committed
(PE-17508) Fix puppet-agent suffix on fedora
This commit modifies the install logic when `osfamily` is `RedHat` to accommodate for the `fedoraf` package suffix when the OS is fedora rather than an `el` derivative. Prior to this commit the `puppet-agent` package would be suffixed with `el` which does not match the package naming convention for fedora.
1 parent fcd381f commit ce5b97b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

manifests/install.pp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,12 @@
108108
} elsif ($::osfamily == 'RedHat') and ($package_version != 'present') {
109109
# Workaround PUP-5802/PUP-5025
110110
package { $::puppet_agent::package_name:
111-
ensure => "${package_version}-1.el${::operatingsystemmajrelease}",
111+
if $::operatingsystemname == 'fedora' {
112+
$pkg_os_suffix = 'fedoraf'
113+
} else {
114+
$pkg_os_suffix = 'el'
115+
}
116+
ensure => "${package_version}-1.${pkg_os_suffix}${::operatingsystemmajrelease}",
112117
* => $_package_options,
113118
}
114119
} elsif ($::osfamily == 'Debian') and ($package_version != 'present') {

0 commit comments

Comments
 (0)