Muehlenhoff has submitted this change and it was merged.
Change subject: gadolinium: Use the role keyword
......................................................................
gadolinium: Use the role keyword
We need this for Hiera-based assignment of Salt grains for debdeploy
Change-Id: I837df5d33091064ac9edbe7bf75bc09ecf1dc22e
---
M manifests/site.pp
1 file changed, 1 insertion(+), 6 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index c9e6ec8..6120757 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -988,13 +988,8 @@
# gadolinium is the webrequest socat multicast relay.
# base_analytics_logging_node is defined in role/logging.pp
node 'gadolinium.wikimedia.org' {
+ role logging, logging::relay::webrequest-multicast,
logging::relay::eventlogging
include standard
- include role::logging
-
- # relay the incoming webrequest log stream to multicast
- include role::logging::relay::webrequest-multicast
- # relay EventLogging traffic over to eventlog1001
- include role::logging::relay::eventlogging
}
# Continuous Integration
--
To view, visit https://gerrit.wikimedia.org/r/247191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I837df5d33091064ac9edbe7bf75bc09ecf1dc22e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
