Forces ubuntu 14.04 on Chef 11 to use upstart #551
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
rposborne
changed the title
olivielpeau
reviewed
Oct 23, 2018
recipes/dd-agent.rb
Outdated
| @@ -105,6 +105,7 @@ def template_vars # rubocop:disable Metrics/AbcSize | |||
| service_provider = nil | |||
| if node['datadog']['agent6'] && | |||
| (((node['platform'] == 'amazon' || node['platform_family'] == 'amazon') && node['platform_version'].to_i != 2) || | |||
| (node['platform'] == 'ubuntu' && node['platform_version'].to_f == 14.04) || | |||
There was a problem hiding this comment.
- Unfortunately this logic is currently duplicated in
https://github.com/DataDog/chef-datadog/blob/master/providers/monitor.rb(twice), so you also need to update it there. - Ubuntu switched to systemd in
15.04, what do you think of comparing with< 15.04instead? (should work since we're comparing floats)
|
Thank you for your contribution @rposborne, I'm merging it and it will be part of release |
|
@remeh Thanks for cleaning up after me!! |
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 addresses #542