Support Ubuntu/bionic, drop Debian 7 & Fedora 25 #605
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
ekohl
reviewed
Jul 8, 2018
manifests/params.pp
Outdated
| @@ -330,7 +330,7 @@ | |||
| 'Debian' : { | |||
| $agent_restart_command = "/usr/sbin/service ${service_name} reload" | |||
| if ( | |||
| ($::operatingsystem == 'Debian') and (versioncmp($::operatingsystemrelease, '8.0') >= 0) or | |||
| ($::operatingsystem == 'Debian') or | |||
| ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemrelease, '15.04') >= 0) | |||
There was a problem hiding this comment.
I know these braces were already here, but they're weird. Technically they're correct but they don't add anything either.
| @@ -23,7 +23,7 @@ | |||
| should contain_class('puppet::agent::service::cron').with(:enabled => false) | |||
| end | |||
| case os | |||
| when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-16/, /\Aarchlinux-/ | |||
| when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/ | |||
There was a problem hiding this comment.
If we've dropped Debian 7 then it can be simplified to /\Adebian-/.
ekohl
changed the title
ekohl
reviewed
Jul 9, 2018
manifests/params.pp
Outdated
| ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemrelease, '15.04') >= 0) | ||
| ) { | ||
| if | ||
| $::operatingsystem == 'Debian' or |
There was a problem hiding this comment.
Indenting looks a bit weird here. Would it be good to keep parenthesis around the entire statement? if (..) {
There was a problem hiding this comment.
Done. I did put the whole condition into one long line as it would look more strange because of the formatting rules we have in place otherwise.
ekohl
approved these changes
Jul 9, 2018
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.
No description provided.