Dzahn has submitted this change and it was merged.
Change subject: Revert "tin,mira: move base::firewall to deployment role"
......................................................................
Revert "tin,mira: move base::firewall to deployment role"
This reverts commit 6012ee00dcdb1f73dac286b0bdead435f8fcf1ea.
Change-Id: I6df14de00ca8915016b02cce0409950f23f2d8fb
---
M manifests/site.pp
M modules/role/manifests/deployment/server.pp
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 4683169..f1b3f9f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2481,6 +2481,7 @@
# deployment servers
node 'tin.eqiad.wmnet', 'mira.codfw.wmnet' {
role deployment::server, labsdb::manager
+ include base::firewall
interface::add_ip6_mapped { 'main':
interface => 'eth0',
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index fc4827a..950aa9e 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -9,8 +9,6 @@
include role::deployment::mediawiki
include role::deployment::services
- include base::firewall
-
class { 'deployment::deployment_server':
deployment_group => $deployment_group,
}
--
To view, visit https://gerrit.wikimedia.org/r/259599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6df14de00ca8915016b02cce0409950f23f2d8fb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[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
