Use systemd by default on Ubuntu 16.10 #5009

Merged
merged 2 commits into from Jun 7, 2016

Conversation

Projects
None yet
3 participants
Contributor

nacc commented Jun 7, 2016

No description provided.

kylog commented Jun 7, 2016

Thanks @nacc!

One minor nit: can you update the commit message on the refactor commit to prepend "(maint)" to the summary line, e.g. so it looks like:
(maint) Refactor ubuntu version checking. (We have a release script that keys off certain formats in the commit summary lines, and a matching travis check for that same format.)

nacc added some commits Jun 6, 2016

(maint) Refactor ubuntu version checking
Use an each iteration to allow for easy insertion of future
systemd-default Ubuntu releases.

Signed-off-by: Nishanth Aravamudan <nish.aravamudan@canonical.com>
(PUP-6391) Use systemd on Ubuntu 16.10
Without this patch applied, Ubuntu 16.10 defaults to upstart, but the
default init-system in 16.10 is systemd.

Signed-off-by: Nishanth Aravamudan <nish.aravamudan@canonical.com>
Contributor

nacc commented Jun 7, 2016

@kylog Just updated the commit message. Will update the Jira issue as well! Thanks for the quick feedback!

@kylog kylog merged commit 509feea into puppetlabs:master Jun 7, 2016

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

CLA signed by all contributors.

Contributor

nacc commented Jun 27, 2016

@kylog apologies for asking in a closed issue, but from a maintenance perspective, would it make sense to adjust the checks so that systemd is assumed to be the default on >= 15.04? e.g. in lib/puppet/provider/service/systemd.rb:

defaultfor :operatingsystem => :ubuntu, (:operatingsystemmajrelease <=> "15.04") == 1

Otherwise, we're going to have to make similar changes for each new release of Ubuntu (and it will be broken when we do).

I'm not sure how to modify/update the other functionality, though, in spec/unit/provider/service/systemd_spec.rb, correspondingly:

[ '15.04', '15.10', '16.04', '16.10' ].each do |ver|

(I don't know Ruby very well, I apologize)

Contributor

nacc commented Jun 27, 2016

@kylog alternatively, could we flip the default so that Ubuntu is assumed to have systemd and just put the (now finite) set of releases that did have upstart as the default in a list?

kylog commented Jul 6, 2016

@nacc, yep that makes total sense, and takes a little work in defaultfor. I think that's what is being tackled in #5069.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment