Dzahn has submitted this change and it was merged.
Change subject: argon: Move base::firewall include into the role
......................................................................
argon: Move base::firewall include into the role
Also move the standard include
Change-Id: I48a569c8ad75b0315884727aa226930879066711
---
M manifests/role/mw-rc-irc.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/mw-rc-irc.pp b/manifests/role/mw-rc-irc.pp
index a93e767..9127a29 100644
--- a/manifests/role/mw-rc-irc.pp
+++ b/manifests/role/mw-rc-irc.pp
@@ -2,6 +2,8 @@
system::role { 'role::mw-rc-irc': description => 'MW Changes IRC Broadcast
Server' }
+ include standard
+ include base::firewall
include passwords::udpmxircecho
$udpmxircecho_pass = $passwords::udpmxircecho::udpmxircecho_pass
diff --git a/manifests/site.pp b/manifests/site.pp
index 6c95631..64a4150 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -218,8 +218,6 @@
# irc.wikimedia.org
node 'argon.wikimedia.org' {
role mw-rc-irc
- include standard
- include base::firewall
}
node 'baham.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/247522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48a569c8ad75b0315884727aa226930879066711
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
