Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/341550 )
Change subject: Enable base::firewall in role::test::system by default
......................................................................
Enable base::firewall in role::test::system by default
With ruthenium converted to base::firewall, include base::firewall
in the role, so that it's enabled by default.
Change-Id: If244ebebaace27628dccada3c2c3b4186cb9c682
---
M manifests/site.pp
M modules/role/manifests/test/system.pp
2 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 63e5461..50b1257 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1234,7 +1234,6 @@
# graphite test machine, currently with SSD caching + spinning disks
node 'graphite1002.eqiad.wmnet' {
role(test::system)
- include ::base::firewall
}
# graphite additional machine, for additional space
@@ -1923,7 +1922,6 @@
# misc. test server, keep (T156208)
node 'multatuli.wikimedia.org' {
role(test::system)
- include ::base::firewall
interface::add_ip6_mapped { 'main':
interface => 'eth0',
@@ -2528,7 +2526,6 @@
role(test::system,
parsoid::testing, parsoid::rt_server, parsoid::rt_client,
parsoid::vd_server, parsoid::vd_client)
- include ::base::firewall
}
# cluster management (salt master, cumin master)
@@ -2732,7 +2729,6 @@
# test system for performance team (T117888)
node 'tungsten.eqiad.wmnet' {
role(test::system, xhgui::app)
- include ::base::firewall
}
# replaced magnesium (RT) (T119112 T123713)
diff --git a/modules/role/manifests/test/system.pp
b/modules/role/manifests/test/system.pp
index 12eaf4d..8cd4214 100644
--- a/modules/role/manifests/test/system.pp
+++ b/modules/role/manifests/test/system.pp
@@ -3,6 +3,7 @@
# filtertags: labs-project-puppet
class role::test::system {
include ::standard
+ include ::base::firewall
system::role { 'role::test::system': description => 'Unpuppetised system
for testing' }
}
--
To view, visit https://gerrit.wikimedia.org/r/341550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If244ebebaace27628dccada3c2c3b4186cb9c682
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
