Dzahn has submitted this change and it was merged.
Change subject: deployment::server: move IPv6 int to role
......................................................................
deployment::server: move IPv6 int to role
Every deployment server should (and does) have a mapped
IPv6 address, and afaict it will always be eth0.
So move this into the role itself and further clean up site.pp.
Change-Id: I3b2e208c1486c0c1a0a1f2edd1918fe2ec0ee7b8
---
M manifests/site.pp
M modules/role/manifests/deployment/server.pp
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 3ac608a..0a1bcec 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2437,10 +2437,6 @@
# deployment servers
node 'tin.eqiad.wmnet', 'mira.codfw.wmnet' {
role deployment::server, labsdb::manager
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
}
# titanium hosts archiva.wikimedia.org
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index 116b237..16e427e 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -4,6 +4,10 @@
) {
include standard
+ interface::add_ip6_mapped { 'main':
+ interface => 'eth0',
+ }
+
# Can't include this while scap is present on the deployment server:
# include misc::deployment::scripts
include role::deployment::mediawiki
--
To view, visit https://gerrit.wikimedia.org/r/250619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b2e208c1486c0c1a0a1f2edd1918fe2ec0ee7b8
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[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
