ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/400394 )
Change subject: move ipv6 setup for dump web servers to the appropriate profiles
......................................................................
move ipv6 setup for dump web servers to the appropriate profiles
Change-Id: I774bd42eda1b04bcd5c86e13f62bfd2a42301108
---
M manifests/site.pp
M modules/profile/manifests/dumps/web/xmldumps_active.pp
M modules/profile/manifests/dumps/web/xmldumps_fallback.pp
3 files changed, 4 insertions(+), 6 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index d19f7e5..df1b8a0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -290,10 +290,7 @@
}
node 'dataset1001.wikimedia.org' {
-
role(dumps::web::xmldumps_active)
-
- interface::add_ip6_mapped { 'main': }
}
# MariaDB 10
@@ -1445,10 +1442,7 @@
# also see dataset1001
node 'ms1001.wikimedia.org' {
-
role(dumps::web::xmldumps_fallback)
-
- interface::add_ip6_mapped { 'main': }
}
node 'ms1002.eqiad.wmnet' {
diff --git a/modules/profile/manifests/dumps/web/xmldumps_active.pp
b/modules/profile/manifests/dumps/web/xmldumps_active.pp
index b785a63..fd9783b 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_active.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_active.pp
@@ -4,6 +4,8 @@
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
) {
+ interface::add_ip6_mapped { 'main': }
+
require profile::dumps::web::nginx
class { '::dumpsuser': }
diff --git a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
index cf00edd..0978a57 100644
--- a/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
+++ b/modules/profile/manifests/dumps/web/xmldumps_fallback.pp
@@ -4,6 +4,8 @@
$xmldumpsdir = hiera('profile::dumps::xmldumpspublicdir'),
$miscdatasetsdir = hiera('profile::dumps::miscdumpsdir'),
) {
+ interface::add_ip6_mapped { 'main': }
+
require profile::dumps::web::nginx
class { '::dumpsuser': }
--
To view, visit https://gerrit.wikimedia.org/r/400394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I774bd42eda1b04bcd5c86e13f62bfd2a42301108
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
