Andrew Bogott has submitted this change and it was merged.
Change subject: ssh: remove provider => upstart from the Service
......................................................................
ssh: remove provider => upstart from the Service
Commit 781864dc added provider => upstart to workaround a combination of
a trusty change (init script not shelling out to /lib/init/upstart-job)
and older puppet (which didn't pick the upstart provider by default).
Now we have a newer puppet though, so this shouldn't be needed anymore.
Change-Id: Ic329765c72de406e93d71009c1db2467cde6e8b2
---
M modules/ssh/manifests/server.pp
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ssh/manifests/server.pp b/modules/ssh/manifests/server.pp
index 2f2670e..c630b11 100644
--- a/modules/ssh/manifests/server.pp
+++ b/modules/ssh/manifests/server.pp
@@ -10,7 +10,6 @@
service { 'ssh':
ensure => running,
subscribe => File['/etc/ssh/sshd_config'],
- provider => 'upstart',
}
if ($::realm == 'labs') {
--
To view, visit https://gerrit.wikimedia.org/r/178402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic329765c72de406e93d71009c1db2467cde6e8b2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
