Don't run enable_ca_trust on EL7 #40
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
`update-ca-trust` ignores all arguments on EL7 so `update-ca-trust enable` and even `update-ca-trust check` (from the unless parameter) actually perform an update. Fixes #voxpupuliGH-38
alexjfisher
commented
Mar 19, 2018
| @@ -1,6 +1,6 @@ | |||
| fixtures: | |||
| repositories: | |||
| stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git" | |||
| remote_file: "git://github.com/lwf/puppet-remote_file.git" | |||
| stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git" | |||
There was a problem hiding this comment.
This makes it nicer for those of us stuck behind corporate firewalls.
alexjfisher
commented
Mar 19, 2018
| @@ -2,7 +2,7 @@ | |||
| class ca_cert::update { | |||
| include ::ca_cert::params | |||
|
|
|||
| if $::osfamily == 'RedHat' { | |||
| if ($::osfamily == 'RedHat' and versioncmp($::operatingsystemrelease, '7') < 0) { | |||
There was a problem hiding this comment.
I'm not sure how long this module will continue to support puppet 3, but since it is currently marked as supported, I've not switched to the newer non-legacy facts.
There was a problem hiding this comment.
I don't think we need to support Puppet 3 any longer - I just haven't run across anything that breaks it yet either.
Feel free to break it and update metadata if you want/need to.
|
Thanks for working through this one - we're not a big RHEL shop so this one was low on the list even though it looks pretty important. |
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.
update-ca-trustignores all arguments on EL7 soupdate-ca-trust enableand evenupdate-ca-trust check(from the unless parameter)actually perform an update.
Fixes #GH-38
I've converted the spec tests for that class to use rspec-puppet-facts.