[MediaWiki-commits] [Gerrit] operations/puppet[production]: LVS: document subnets in balancer assignment
BBlack has submitted this change and it was merged.
Change subject: LVS: document subnets in balancer assignment
..
LVS: document subnets in balancer assignment
There's no "good" place to do this with how things are split up in
hieradata, but putting it here (as well as in revdns comments)
should hopefully make people think twice when they commit.
Bug: T143915
Change-Id: I0fcbbcfa8b2547e44b10b55c7d657202104dd567
---
M modules/role/manifests/lvs/balancer.pp
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 37666a0..f36647e 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -12,17 +12,17 @@
$lvs_balancer_ips = $::hostname ? {
# eqiad
-/^(lvs10(0[14]|07|10))$/ => [
+/^(lvs10(0[14]|07|10))$/ => [ # IPs must be high-traffic1 subnet
$sip['text'][$::site],
],
-/^(lvs10(0[25]|08|11))$/ => [
+/^(lvs10(0[25]|08|11))$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['dns_rec'][$::site],
$sip['misc_web'][$::site],
$sip['git-ssh'][$::site],
],
-/^(lvs10(0[36]|09|12))$/ => [
+/^(lvs10(0[36]|09|12))$/ => [ # IPs must be low-traffic subnet
$sip['apaches'][$::site],
$sip['api'][$::site],
$sip['rendering'][$::site],
@@ -49,16 +49,16 @@
],
# codfw (should mirror eqiad above, eventually, and become merged with
it via regex
-/^(lvs200[14])$/ => [
+/^(lvs200[14])$/ => [ # IPs must be high-traffic1 subnet
$sip['text'][$::site],
],
-/^(lvs200[25])$/ => [
+/^(lvs200[25])$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['misc_web'][$::site],
$sip['dns_rec'][$::site],
],
-/^(lvs200[36])$/ => [
+/^(lvs200[36])$/ => [ # IPs must be low-traffic subnet
$sip['apaches'][$::site],
$sip['api'][$::site],
$sip['rendering'][$::site],
@@ -82,16 +82,16 @@
],
# esams + ulsfo
-/^(lvs[34]00[13])$/ => [
+/^(lvs[34]00[13])$/ => [ # IPs must be high-traffic1 subnet
$sip['text'][$::site],
],
-/^(lvs300[24])$/ => [
+/^(lvs300[24])$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['misc_web'][$::site],
$sip['dns_rec'][$::site],
],
-/^(lvs400[24])$/ => [
+/^(lvs400[24])$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['misc_web'][$::site],
--
To view, visit https://gerrit.wikimedia.org/r/318083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fcbbcfa8b2547e44b10b55c7d657202104dd567
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Ema
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: LVS: document subnets in balancer assignment
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318083
Change subject: LVS: document subnets in balancer assignment
..
LVS: document subnets in balancer assignment
There's no "good" place to do this with how things are split up in
hieradata, but putting it here (as well as in revdns comments)
should hopefully make people think twice when they commit.
Bug: T143915
Change-Id: I0fcbbcfa8b2547e44b10b55c7d657202104dd567
---
M modules/role/manifests/lvs/balancer.pp
1 file changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/318083/1
diff --git a/modules/role/manifests/lvs/balancer.pp
b/modules/role/manifests/lvs/balancer.pp
index 37666a0..f36647e 100644
--- a/modules/role/manifests/lvs/balancer.pp
+++ b/modules/role/manifests/lvs/balancer.pp
@@ -12,17 +12,17 @@
$lvs_balancer_ips = $::hostname ? {
# eqiad
-/^(lvs10(0[14]|07|10))$/ => [
+/^(lvs10(0[14]|07|10))$/ => [ # IPs must be high-traffic1 subnet
$sip['text'][$::site],
],
-/^(lvs10(0[25]|08|11))$/ => [
+/^(lvs10(0[25]|08|11))$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['dns_rec'][$::site],
$sip['misc_web'][$::site],
$sip['git-ssh'][$::site],
],
-/^(lvs10(0[36]|09|12))$/ => [
+/^(lvs10(0[36]|09|12))$/ => [ # IPs must be low-traffic subnet
$sip['apaches'][$::site],
$sip['api'][$::site],
$sip['rendering'][$::site],
@@ -49,16 +49,16 @@
],
# codfw (should mirror eqiad above, eventually, and become merged with
it via regex
-/^(lvs200[14])$/ => [
+/^(lvs200[14])$/ => [ # IPs must be high-traffic1 subnet
$sip['text'][$::site],
],
-/^(lvs200[25])$/ => [
+/^(lvs200[25])$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['misc_web'][$::site],
$sip['dns_rec'][$::site],
],
-/^(lvs200[36])$/ => [
+/^(lvs200[36])$/ => [ # IPs must be low-traffic subnet
$sip['apaches'][$::site],
$sip['api'][$::site],
$sip['rendering'][$::site],
@@ -82,16 +82,16 @@
],
# esams + ulsfo
-/^(lvs[34]00[13])$/ => [
+/^(lvs[34]00[13])$/ => [ # IPs must be high-traffic1 subnet
$sip['text'][$::site],
],
-/^(lvs300[24])$/ => [
+/^(lvs300[24])$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['misc_web'][$::site],
$sip['dns_rec'][$::site],
],
-/^(lvs400[24])$/ => [
+/^(lvs400[24])$/ => [ # IPs must be high-traffic2 subnet
$sip['upload'][$::site],
$sip['maps'][$::site],
$sip['misc_web'][$::site],
--
To view, visit https://gerrit.wikimedia.org/r/318083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fcbbcfa8b2547e44b10b55c7d657202104dd567
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
