Muehlenhoff has submitted this change and it was merged.
Change subject: Enable base::firewall in the pool counter role
......................................................................
Enable base::firewall in the pool counter role
All existing pool counter hosts now use base::firewall
Change-Id: Iefdeb23e52bbcc27815e408df3751e08f280939e
---
M manifests/role/poolcounter.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/poolcounter.pp b/manifests/role/poolcounter.pp
index 428f7e3..2e83fd5 100644
--- a/manifests/role/poolcounter.pp
+++ b/manifests/role/poolcounter.pp
@@ -1,5 +1,6 @@
class role::poolcounter{
include ::poolcounter
+ include base::firewall
system::role { 'role::poolcounter':
description => 'PoolCounter server',
diff --git a/manifests/site.pp b/manifests/site.pp
index 305c361..fa93176 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1178,7 +1178,6 @@
role poolcounter, backup::director, backup::storage
include standard
- include base::firewall
interface::add_ip6_mapped { 'main':
interface => 'eth0',
}
@@ -2415,7 +2414,6 @@
node 'potassium.eqiad.wmnet' {
role poolcounter
include standard
- include base::firewall
}
# pybal-test200X VMs are used for pybal testing/development
@@ -2711,7 +2709,6 @@
node /(subra|suhail)\.codfw\.wmnet/ {
role poolcounter
include standard
- include base::firewall
}
# neon-like monitoring host in codfw
--
To view, visit https://gerrit.wikimedia.org/r/290405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iefdeb23e52bbcc27815e408df3751e08f280939e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
