Andrew Bogott has submitted this change and it was merged.
Change subject: Don't include base::instance-upstarts on Debian.
......................................................................
Don't include base::instance-upstarts on Debian.
Probably harmless but I can't imagine it does anything
useful.
Change-Id: I709c504c41dfea723b4439877463e09d590a7469
---
M manifests/role/labs.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Faidon Liambotis: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/labs.pp b/manifests/role/labs.pp
index e784c47..36ced47 100644
--- a/manifests/role/labs.pp
+++ b/manifests/role/labs.pp
@@ -1,9 +1,12 @@
class role::labs::instance {
include standard
- include base::instance-upstarts
include sudo
+ if os_version('ubuntu > lucid') {
+ include base::instance-upstarts
+ }
+
sudo::group { 'ops':
privileges => ['ALL=(ALL) NOPASSWD: ALL'],
}
--
To view, visit https://gerrit.wikimedia.org/r/181541
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I709c504c41dfea723b4439877463e09d590a7469
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
