(PE-17508) Fix puppet-agent suffix on fedora #154
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
johnduarte
force-pushed
the
pe-17508-use-fedoraf-package-suffix
branch
from
ce5b97b to
cd4ce6e
Compare
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.
johnduarte
force-pushed
the
pe-17508-use-fedoraf-package-suffix
branch
from
cd4ce6e to
c1c77dc
Compare
highb
reviewed
Sep 16, 2016
| package { $::puppet_agent::package_name: | ||
| ensure => "${package_version}-1.el${::operatingsystemmajrelease}", | ||
| ensure => "${package_version}-1.${pkg_os_suffix}${::operatingsystemmajrelease}", |
There was a problem hiding this comment.
This indicates that I have never tested this module on Fedora. Fail.
There was a problem hiding this comment.
I guess it's a new platform, so that makes some sort of sense.
There was a problem hiding this comment.
@johnduarte The specs need to be updated to test this behavior:
Failures:
1) puppet_agent supported operating systems on fedora-22-x86_64 puppet_agent class without any parameters should contain Package[puppet-agent] with ensure => "1.2.5-1.el22"
Failure/Error: it { is_expected.to contain_package('puppet-agent').with_ensure(yum_package_version) }
expected that the catalogue would contain Package[puppet-agent] with ensure set to "1.2.5-1.el22" but it is set to "1.2.5-1.fedoraf22"
# ./spec/classes/puppet_agent_spec.rb:126
2) puppet_agent supported operating systems on fedora-22-x86_64 puppet_agent class without any parameters should contain Package[puppet-agent] with ensure => "1.2.5-1.el22"
Failure/Error: it { is_expected.to contain_package('puppet-agent').with_ensure(yum_package_version) }
expected that the catalogue would contain Package[puppet-agent] with ensure set to "1.2.5-1.el22" but it is set to "1.2.5-1.fedoraf22"
Once that is done, I'm 👍 on this PR.
|
@highb specs updated and 🍏 in Travis. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit modifies the install logic when
osfamilyisRedHatto accommodate for the
fedorafpackage suffix when the OS isfedora rather than an
elderivative.Prior to this commit the
puppet-agentpackage would be suffixedwith
elwhich does not match the package naming convention forfedora.