Muehlenhoff has submitted this change and it was merged.
Change subject: Move base::firewall include into the gerrit::production role
......................................................................
Move base::firewall include into the gerrit::production role
Change-Id: I85e18985e445be8d8da772fe3c04e1b6c75cf86a
---
M manifests/role/gerrit.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 1 deletion(-)
Approvals:
Muehlenhoff: Verified; Looks good to me, approved
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index ef0fb0d..6ebb381 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -4,6 +4,7 @@
class production {
system::role { 'role::gerrit::production': description => 'Gerrit
master' }
include role::backup::host
+ include base::firewall
sslcert::certificate { 'gerrit.wikimedia.org': }
diff --git a/manifests/site.pp b/manifests/site.pp
index fbff830..870d859 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2606,7 +2606,6 @@
# to update the role::zuul::production
role gerrit::production
include standard
- include base::firewall
interface::add_ip6_mapped { 'main': }
}
--
To view, visit https://gerrit.wikimedia.org/r/245975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85e18985e445be8d8da772fe3c04e1b6c75cf86a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
