Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397728 )
Change subject: mirrors: move standard include out of site
......................................................................
mirrors: move standard include out of site
This fixes another style violation for the include in site.
Change-Id: Ie204128ba6ea47223e520eaa630f3b932eeaf311
---
M manifests/site.pp
M modules/role/manifests/mirrors.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 724e999..3e53e0d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2103,8 +2103,6 @@
node 'sodium.wikimedia.org' {
role(mirrors)
- include ::standard
-
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/mirrors.pp
b/modules/role/manifests/mirrors.pp
index 5af8128..7dea485 100644
--- a/modules/role/manifests/mirrors.pp
+++ b/modules/role/manifests/mirrors.pp
@@ -7,6 +7,7 @@
description => 'Mirrors server',
}
+ include ::standard
include mirrors::serve
include mirrors::tails
include ::profile::base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/397728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie204128ba6ea47223e520eaa630f3b932eeaf311
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
