Faidon Liambotis has submitted this change and it was merged.
Change subject: rsyslog: use provider => 'upstart'
......................................................................
rsyslog: use provider => 'upstart'
Similarly to Ifb657c7, switch rsyslog to upstart as well, as it fails on
trusty otherwise. Both this and the SSH one can be removed once we
upgrade to a newer version of puppet, as puppet gained in a 2.7
point-release the line:
defaultfor :operatingsystem => :ubuntu
which we don't seem to have in precise's 2.7, nor do we have support for
newer style upstart overrides.
Change-Id: I688954780d0c642d9033a940d45584203c9c8369
---
M modules/base/manifests/init.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index d3e36f0..4315acc 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -296,6 +296,7 @@
ensure => running,
require => Package['rsyslog'],
subscribe => File['/etc/rsyslog.d/30-remote-syslog.conf'],
+ provider => 'upstart',
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/112700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I688954780d0c642d9033a940d45584203c9c8369
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
