Skip to content

Commit

Permalink
Adds new virtual sites BOM05 and DFW10 + fixes IPv6 for two VMs (#305)
Browse files Browse the repository at this point in the history
* Adds new virtual sites BOM05 and DFW10

The metros are overloaded due to periodic, sychronized client
integrations and/or are just too busy, causing switch discards. These
new sites should help to alleviate the problems until we can find more
permanent and long term solution.

* Updates IPv6 for mlab1-ber01 and mlab1-doh01

There appears to be some sort of bug in the interaction of Terraform and
GCP in which new VMs get an ephemeral IPv6 address, even though the
Terraform configs specify using the static IPv6 address that Terraform
creates. You can run "terraform plan" and it will tell you that it is
going to update the IPv6 address to the static one, but "terraform
apply" has no apparent affect, and when you run "terraform plan" again
it still wants to update the IPv6 address to the static one, even though
it told you it had already done this, with no apparent errors. The IPv6
stuff is very new to the Google provider, and this is likely a bug we
are hitting.
  • Loading branch information
nkinkade authored Nov 13, 2023
1 parent 4f2537b commit 6cac5dc
Show file tree
Hide file tree
Showing 5 changed files with 136 additions and 2 deletions.
2 changes: 2 additions & 0 deletions sites.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ local sites = {
bom02: import 'sites/bom02.jsonnet',
bom03: import 'sites/bom03.jsonnet',
bom04: import 'sites/bom04.jsonnet',
bom05: import 'sites/bom05.jsonnet',
bru01: import 'sites/bru01.jsonnet',
bru02: import 'sites/bru02.jsonnet',
bru04: import 'sites/bru04.jsonnet',
Expand All @@ -46,6 +47,7 @@ local sites = {
dfw03: import 'sites/dfw03.jsonnet',
dfw08: import 'sites/dfw08.jsonnet',
dfw09: import 'sites/dfw09.jsonnet',
dfw10: import 'sites/dfw10.jsonnet',
doh01: import 'sites/doh01.jsonnet',
dub01: import 'sites/dub01.jsonnet',
eze01: import 'sites/eze01.jsonnet',
Expand Down
2 changes: 1 addition & 1 deletion sites/ber01.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sitesDefault {
address: '34.32.35.146/32',
},
ipv6+: {
address: '2600:1901:81f0:266:0:1::/128',
address: '2600:1901:81f0:266::/128',
},
},
project: 'mlab-oti',
Expand Down
66 changes: 66 additions & 0 deletions sites/bom05.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'bom05',
annotations+: {
provider: 'gcp',
},
machines+: {
mlab1+: {
network+: {
ipv4+: {
address: '35.200.190.37/32',
},
ipv6+: {
address: '2600:1900:40a0:f2f2:0:11::/128',
},
},
project: 'mlab-oti',
},
mlab2: {
disk: 'pd-ssd',
iface: 'ens4',
model: 'n2-highcpu-4',
network: {
ipv4: {
address: '35.200.235.108/32',
},
ipv6: {
address: '2600:1900:40a0:f2f2:0:10::/128',
},
},
project: 'mlab-oti',
},
mlab3: {
disk: 'pd-ssd',
iface: 'ens4',
model: 'n2-highcpu-4',
network: {
ipv4: {
address: '34.93.231.55/32',
},
ipv6: {
address: '2600:1900:40a0:f2f2:0:f::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'AS',
country_code: 'IN',
metro: 'bom',
city: 'Mumbai',
state: '',
latitude: 19.0886,
longitude: 72.8681,
},
lifecycle+: {
created: '2023-11-13',
},
}
66 changes: 66 additions & 0 deletions sites/dfw10.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'dfw10',
annotations+: {
provider: 'gcp',
},
machines+: {
mlab1+: {
network+: {
ipv4+: {
address: '34.174.31.95/32',
},
ipv6+: {
address: '2600:1901:8140:9cd3:0:1b::/128',
},
},
project: 'mlab-oti',
},
mlab2: {
disk: 'pd-ssd',
iface: 'ens4',
model: 'n2-highcpu-4',
network: {
ipv4: {
address: '34.174.90.19/32',
},
ipv6: {
address: '2600:1901:8140:9cd3:0:1c::/128',
},
},
project: 'mlab-oti',
},
mlab3: {
disk: 'pd-ssd',
iface: 'ens4',
model: 'n2-highcpu-4',
network: {
ipv4: {
address: '34.174.108.55/32',
},
ipv6: {
address: '2600:1901:8140:9cd3:0:1d::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'NA',
country_code: 'US',
metro: 'dfw',
city: 'Dallas',
state: 'TX',
latitude: 32.8969,
longitude: -97.0381,
},
lifecycle+: {
created: '2023-11-13',
},
}
2 changes: 1 addition & 1 deletion sites/doh01.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sitesDefault {
address: '34.18.43.81/32',
},
ipv6+: {
address: '2600:1901:81c0:7ec:0:1::/128',
address: '2600:1901:81c0:7ec::/128',
},
},
project: 'mlab-oti',
Expand Down

0 comments on commit 6cac5dc

Please sign in to comment.