Skip to content

Commit

Permalink
(PE-17508) Fix puppet-agent suffix on fedora
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
John Duarte committed Sep 16, 2016
1 parent fcd381f commit ce5b97b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion manifests/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,12 @@
} elsif ($::osfamily == 'RedHat') and ($package_version != 'present') {
# Workaround PUP-5802/PUP-5025
package { $::puppet_agent::package_name:
ensure => "${package_version}-1.el${::operatingsystemmajrelease}",
if $::operatingsystemname == 'fedora' {
$pkg_os_suffix = 'fedoraf'
} else {
$pkg_os_suffix = 'el'
}
ensure => "${package_version}-1.${pkg_os_suffix}${::operatingsystemmajrelease}",
* => $_package_options,
}
} elsif ($::osfamily == 'Debian') and ($package_version != 'present') {
Expand Down

0 comments on commit ce5b97b

Please sign in to comment.