Mark Bergsma has submitted this change and it was merged.
Change subject: Factor out addition of localhost IPs to ancestor class
......................................................................
Factor out addition of localhost IPs to ancestor class
Change-Id: Ie6ddabcfedfb79a33286299396aa88be95235681
---
M manifests/role/cache.pp
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 802eb1d..3bfb240 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -446,6 +446,7 @@
$cluster_tier = 2
$default_backend = $::mw_primary
}
+ $wikimedia_networks =
flatten([$network::constants::all_networks, "127.0.0.0/8", "::1/128"])
if regsubst($::memorytotal, "^([0-9]+)\.[0-9]* GB$", "\1") > 96
{
$memory_storage_size = 16
@@ -541,7 +542,7 @@
'max_connections' => 1000,
'weight' => $backend_weight,
}],
- wikimedia_networks =>
flatten([$network::constants::all_networks, "127.0.0.0/8", "::1/128"]),
+ wikimedia_networks => $wikimedia_networks,
xff_sources => $network::constants::all_networks
}
@@ -673,7 +674,7 @@
'max_connections' => 1000,
'weight' => $backend_weight,
}],
- wikimedia_networks =>
flatten([$network::constants::all_networks, "127.0.0.0/8", "::1/128"]),
+ wikimedia_networks => $wikimedia_networks,
xff_sources => $network::constants::all_networks
}
@@ -878,6 +879,7 @@
'between_bytes_timeout' => "4s",
'max_connections' => 600,
}],
+ wikimedia_networks => $wikimedia_networks,
xff_sources => $network::constants::all_networks
}
--
To view, visit https://gerrit.wikimedia.org/r/68379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6ddabcfedfb79a33286299396aa88be95235681
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
