Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186891
Change subject: Make standard class's exim including behavior configurable
......................................................................
Make standard class's exim including behavior configurable
Because some of the instances have their own exim classes
and labs includes 'standard' everywhere.
Bug: T86575
Change-Id: Ibfa6e218735b5fa233ea50b2c1e2f641d712f9ca
---
M manifests/site.pp
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/186891/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 109341a..3628f0b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,14 +21,20 @@
# Base nodes
# Class for *most* servers, standard includes
-class standard {
+class standard(
+ $has_exim_sender = true,
+) {
include base
include role::ntp
- include role::mail::sender
include role::diamond
if $::realm == 'production' {
include ganglia # No ganglia in labs
}
+ # Some instances have their own exim definition that
+ # will conflict with this
+ if $has_exim_sender {
+ include role::mail::sender
+ }
}
class standard-noexim {
--
To view, visit https://gerrit.wikimedia.org/r/186891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfa6e218735b5fa233ea50b2c1e2f641d712f9ca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
