Skip to content

Forces ubuntu 14.04 on Chef 11 to use upstart#551

Merged
remeh merged 2 commits into
DataDog:masterfrom
rposborne:master
Mar 5, 2019
Merged

Forces ubuntu 14.04 on Chef 11 to use upstart#551
remeh merged 2 commits into
DataDog:masterfrom
rposborne:master

Conversation

@rposborne

Copy link
Copy Markdown
Contributor

This addresses #542

@rposborne rposborne changed the title Adds a patch so that ubuntu 14.04 on Chef 11 will use upstart Forces ubuntu 14.04 on Chef 11 to use upstart Jul 21, 2018

@olivielpeau olivielpeau left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rposborne for the fix, I left a couple of notes

Comment thread recipes/dd-agent.rb Outdated
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) ||

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • 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.04 instead? (should work since we're comparing floats)

@olivielpeau olivielpeau added this to the 2.17.0 milestone Oct 23, 2018
@remeh remeh modified the milestones: 2.17.0, 3.0, 2.18.0 Feb 26, 2019
@remeh

remeh commented Mar 5, 2019

Copy link
Copy Markdown
Contributor

Thank you for your contribution @rposborne, I'm merging it and it will be part of release 2.18.0.

@remeh
remeh merged commit 0cc4f6a into DataDog:master Mar 5, 2019
@rposborne

Copy link
Copy Markdown
Contributor Author

@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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants