Muehlenhoff has submitted this change and it was merged. Change subject: Add salt grains for mxes ......................................................................
Add salt grains for mxes Change-Id: I4f3e4c996262dd28ce7fd8ae3cfda7a65f7b7355 --- M hieradata/role/common/mail/mx.yaml M modules/debdeploy/templates/debdeploy.erb 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/mail/mx.yaml b/hieradata/role/common/mail/mx.yaml index d32b0db..23754fc 100644 --- a/hieradata/role/common/mail/mx.yaml +++ b/hieradata/role/common/mail/mx.yaml @@ -1,3 +1,6 @@ standard::has_default_mail_relay: false admin::groups: - oit +debdeploy::grains: + debdeploy-mx: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index af66c11..7f14be3 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -22,3 +22,4 @@ restbase-codfw = debdeploy-restbase-codfw:standard restbase = debdeploy-restbase-codfw:standard, debdeploy-restbase-eqiad:standard etcd = debdeploy-etcd:standard +mx = debdeploy-mx:standard -- To view, visit https://gerrit.wikimedia.org/r/246954 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f3e4c996262dd28ce7fd8ae3cfda7a65f7b7355 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <[email protected]> Gerrit-Reviewer: Muehlenhoff <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
