Skip to content

Commit

Permalink
First round on migrations from standalone VMs to MIGs (#319)
Browse files Browse the repository at this point in the history
* Retires first round of sites migrated to MIGs

m-lab/ops-tracker#1905 (comment)

* Adds new MIG sites

* Adds MIG site iad09

This is replacing the older, standalone VM site iad07
  • Loading branch information
nkinkade authored Feb 8, 2024
1 parent 584df4a commit 36cd741
Show file tree
Hide file tree
Showing 15 changed files with 285 additions and 6 deletions.
5 changes: 5 additions & 0 deletions retired.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ local retiredSites = {
dfw07: import 'sites/dfw07.jsonnet',
dfw10: import 'sites/dfw10.jsonnet',
dfw11: import 'sites/dfw11.jsonnet',
del03: import 'sites/del03.jsonnet',
eze02: import 'sites/eze02.jsonnet',
fra01: import 'sites/fra01.jsonnet',
fra02: import 'sites/fra02.jsonnet',
Expand All @@ -48,9 +49,11 @@ local retiredSites = {
hnd01: import 'sites/hnd01.jsonnet',
hnd03: import 'sites/hnd03.jsonnet',
hnd04: import 'sites/hnd04.jsonnet',
hnd06: import 'sites/hnd06.jsonnet',
iad01: import 'sites/iad01.jsonnet',
iad05: import 'sites/iad05.jsonnet',
iad06: import 'sites/iad06.jsonnet',
iad07: import 'sites/iad07.jsonnet',
lax01: import 'sites/lax01.jsonnet',
lax02: import 'sites/lax02.jsonnet',
lax03: import 'sites/lax03.jsonnet',
Expand Down Expand Up @@ -104,6 +107,7 @@ local retiredSites = {
prg06: import 'sites/prg06.jsonnet',
scl02: import 'sites/scl02.jsonnet',
scl04: import 'sites/scl04.jsonnet',
scl05: import 'sites/scl05.jsonnet',
sea01: import 'sites/sea01.jsonnet',
sea02: import 'sites/sea02.jsonnet',
sea05: import 'sites/sea05.jsonnet',
Expand All @@ -115,6 +119,7 @@ local retiredSites = {
syd02: import 'sites/syd02.jsonnet',
syd04: import 'sites/syd04.jsonnet',
syd06: import 'sites/syd06.jsonnet',
syd07: import 'sites/syd07.jsonnet',
trn01: import 'sites/trn01.jsonnet',
vie01: import 'sites/vie01.jsonnet',
wlg01: import 'sites/wlg01.jsonnet',
Expand Down
13 changes: 7 additions & 6 deletions sites.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ local sites = {
cpt01: import 'sites/cpt01.jsonnet',
del01: import 'sites/del01.jsonnet',
del02: import 'sites/del02.jsonnet',
del03: import 'sites/del03.jsonnet',
del04: import 'sites/del04.jsonnet',
del05: import 'sites/del05.jsonnet',
den02: import 'sites/den02.jsonnet',
den04: import 'sites/den04.jsonnet',
den05: import 'sites/den05.jsonnet',
Expand Down Expand Up @@ -61,15 +61,16 @@ local sites = {
hkg04: import 'sites/hkg04.jsonnet',
hnd02: import 'sites/hnd02.jsonnet',
hnd05: import 'sites/hnd05.jsonnet',
hnd06: import 'sites/hnd06.jsonnet',
hnd07: import 'sites/hnd07.jsonnet',
hnl01: import 'sites/hnl01.jsonnet',
iad02: import 'sites/iad02.jsonnet',
iad03: import 'sites/iad03.jsonnet',
iad04: import 'sites/iad04.jsonnet',
iad07: import 'sites/iad07.jsonnet',
iad08: import 'sites/iad08.jsonnet',
iad09: import 'sites/iad09.jsonnet',
icn01: import 'sites/icn01.jsonnet',
jnb01: import 'sites/jnb01.jsonnet',
jnb02: import 'sites/jnb02.jsonnet',
kix01: import 'sites/kix01.jsonnet',
las01: import 'sites/las01.jsonnet',
lax04: import 'sites/lax04.jsonnet',
Expand All @@ -82,7 +83,7 @@ local sites = {
lga08: import 'sites/lga08.jsonnet',
lhr04: import 'sites/lhr04.jsonnet',
lhr07: import 'sites/lhr07.jsonnet',
lhr09: import 'sites/lhr09.jsonnet',
lhr10: import 'sites/lhr10.jsonnet',
lim01: import 'sites/lim01.jsonnet',
lim02: import 'sites/lim02.jsonnet',
lim03: import 'sites/lim03.jsonnet',
Expand Down Expand Up @@ -133,7 +134,7 @@ local sites = {
prg05: import 'sites/prg05.jsonnet',
scl01: import 'sites/scl01.jsonnet',
scl03: import 'sites/scl03.jsonnet',
scl05: import 'sites/scl05.jsonnet',
scl06: import 'sites/scl06.jsonnet',
sea03: import 'sites/sea03.jsonnet',
sea04: import 'sites/sea04.jsonnet',
sea08: import 'sites/sea08.jsonnet',
Expand All @@ -145,7 +146,7 @@ local sites = {
svg01: import 'sites/svg01.jsonnet',
syd03: import 'sites/syd03.jsonnet',
syd05: import 'sites/syd05.jsonnet',
syd07: import 'sites/syd07.jsonnet',
syd08: import 'sites/syd08.jsonnet',
tgd01: import 'sites/tgd01.jsonnet',
tlv01: import 'sites/tlv01.jsonnet',
tnr01: import 'sites/tnr01.jsonnet',
Expand Down
1 change: 1 addition & 0 deletions sites/del03.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ sitesDefault {
},
lifecycle+: {
created: '2022-09-08',
retired: '2024-02-07',
},
}
38 changes: 38 additions & 0 deletions sites/del05.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'del05',
annotations+: {
provider: 'gcp',
},
machines+: {
mlab1+: {
network+: {
ipv4+: {
address: '34.131.115.191/32',
},
ipv6+: {
address: '2600:1900:41b0:a72:8000::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'AS',
country_code: 'IN',
metro: 'del',
city: 'New Delhi',
state: '',
latitude: 28.5562,
longitude: 77.1000,
},
lifecycle+: {
created: '2024-02-07',
},
}
1 change: 1 addition & 0 deletions sites/hnd06.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,6 @@ sitesDefault {
},
lifecycle+: {
created: '2022-09-08',
retired: '2024-02-07',
},
}
38 changes: 38 additions & 0 deletions sites/hnd07.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'hnd07',
annotations+: {
provider: 'gcp',
},
machines+: {
mlab1+: {
network+: {
ipv4+: {
address: '34.84.179.201/32',
},
ipv6+: {
address: '2600:1900:4050:46:8000::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'AS',
country_code: 'JP',
metro: 'hnd',
city: 'Tokyo',
state: '',
latitude: 35.5522,
longitude: 139.78,
},
lifecycle+: {
created: '2024-02-07',
},
}
1 change: 1 addition & 0 deletions sites/iad07.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@ sitesDefault {
},
lifecycle+: {
created: '2022-03-02',
retired: '2024-02-07',
},
}
38 changes: 38 additions & 0 deletions sites/iad09.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'iad09',
annotations+: {
provider: 'gcp',
},
machines+: {
mlab1+: {
network+: {
ipv4+: {
address: '34.150.246.35/32',
},
ipv6+: {
address: '2600:1900:4090:5709:8000:1::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'NA',
country_code: 'US',
metro: 'iad',
city: 'Washington',
state: 'DC',
latitude: 38.9444,
longitude: -77.4558,
},
lifecycle+: {
created: '2024-02-08',
},
}
38 changes: 38 additions & 0 deletions sites/jnb02.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'jnb02',
annotations+: {
provider: 'gcp',
},
machines+: {
mlab1+: {
network+: {
ipv4+: {
address: '34.35.31.99/32',
},
ipv6+: {
address: '2600:1900:8000:6b8:8000::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'AF',
country_code: 'ZA',
metro: 'jnb',
city: 'Johannesburg',
state: '',
latitude: -26.2035,
longitude: 28.1335,
},
lifecycle+: {
created: '2024-02-07',
},
}
1 change: 1 addition & 0 deletions sites/lhr09.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ sitesDefault {
},
lifecycle+: {
created: '2022-03-02',
retired: '2024-02-07',
},
}
39 changes: 39 additions & 0 deletions sites/lhr10.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'lhr10',
annotations+: {
type: 'virtual',
provider: 'gcp',
},
machines: {
mlab1+: {
network+: {
ipv4+: {
address: '34.147.202.50/32',
},
ipv6+: {
address: '2600:1900:40c0:f08e:8000::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'EU',
country_code: 'GB',
metro: 'lhr',
city: 'London',
state: '',
latitude: 51.4697,
longitude: -0.4514,
},
lifecycle+: {
created: '2024-02-07',
},
}
1 change: 1 addition & 0 deletions sites/scl05.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ sitesDefault {
},
lifecycle+: {
created: '2022-09-08',
retired: '2024-02-07',
},
}
38 changes: 38 additions & 0 deletions sites/scl06.jsonnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
local sitesDefault = import 'sites/_default_virtual.jsonnet';

sitesDefault {
name: 'scl06',
annotations+: {
provider: 'gcp',
},
machines+: {
mlab1+: {
network+: {
ipv4+: {
address: '34.176.183.137/32',
},
ipv6+: {
address: '2600:1901:4010:c39:8000::/128',
},
},
project: 'mlab-oti',
},
},
transit+: {
provider: 'Google LLC',
uplink: '1g',
asn: 'AS396982',
},
location+: {
continent_code: 'SA',
country_code: 'CL',
metro: 'scl',
city: 'Santiago',
state: '',
latitude: -33.3928,
longitude: -70.7856,
},
lifecycle+: {
created: '2024-02-07',
},
}
1 change: 1 addition & 0 deletions sites/syd07.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ sitesDefault {
},
lifecycle+: {
created: '2022-09-08',
retired: '2024-02-07',
},
}
Loading

0 comments on commit 36cd741

Please sign in to comment.