Ccing Jeff Green

It should be possible to point it back to the deployment-salt puppet master. Never tried though :(

Note: all patches applied on puppetmaster must be sent to Gerrit first then cherry picked in /var/lib/git/operations/puppet . That is the only way to track who is doing what and when on a shared infrastructure.

/me pokes @Jgreen

We need to test mx functionality, as part of bounce handler testing, so we need role::mail::mx which conflicts with labs standard instance config .
The local change in question is:

class standard {

#include role::mail::sender # disabled b/c conflicts with role::mail::mx

I don't know of a way to do this without breaking other labs stuff.

background: https://lists.wikimedia.org/pipermail/labs-l/2014-October/002977.html

I think the underlying problem (not include role::mail::sender) is fixable by hiera; this would solve a similar situation with tools-mail where we need a different exim package for LDAP lookups as well.

Change 186891 had a related patch set uploaded (by Yuvipanda):
Make standard class's exim including behavior configurable

https://gerrit.wikimedia.org/r/186891

Patch-For-Review

Change 186891 merged by Yuvipanda:
Make standard class's exim including behavior configurable

https://gerrit.wikimedia.org/r/186891

In T86575#999914, @gerritbot wrote:

Change 186891 merged by Yuvipanda:
Make standard class's exim including behavior configurable

https://gerrit.wikimedia.org/r/186891

is that all that was needed? What else is needed here?

That didn't actually work yet :) Me and Joe are looking into it. After that I'll need to set the param in hiera for that instance and switch it to deployment-salt, and then hope that it doesn't fail more.

Change 187318 had a related patch set uploaded (by Yuvipanda):
beta: Disable standard mail sender on deployment-mx

https://gerrit.wikimedia.org/r/187318

Patch-For-Review

Change 187318 merged by Yuvipanda:
beta: Disable standard mail sender on deployment-mx

https://gerrit.wikimedia.org/r/187318