Andrew Bogott has submitted this change and it was merged.
Change subject: Don't install sudo on labs. We use sudo-ldap instead.
......................................................................
Don't install sudo on labs. We use sudo-ldap instead.
This is a modification of Change-Id: If3233ed70b4b4b232685f4db932e548ad1c48f56
sudo-ldap and sudo are either/or. The above change installed sudo on labs
instances, removing sudo-ldap, and breaking some things.
Change-Id: If45629be89cf57ab77d7d29dd8047fbc3b897866
---
M modules/sudo/manifests/init.pp
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 62a1350..4c8d98e 100644
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -1,5 +1,9 @@
class sudo {
- package { 'sudo':
- ensure => installed,
+ if $::realm == 'labs' {
+ # We use sudo-ldap, defined elsewhere.
+ } else {
+ package { 'sudo':
+ ensure => installed,
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/178427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If45629be89cf57ab77d7d29dd8047fbc3b897866
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
