diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml index eb25bb2..d6b638c 100644 --- a/ansible/group_vars/nimbus.mainnet.yml +++ b/ansible/group_vars/nimbus.mainnet.yml @@ -150,7 +150,7 @@ nodes_layout: - { branch: 'unstable', num: 1 } - { branch: 'unstable', num: 2 } - 'linux-06.ih-eu-mda1.nimbus.mainnet': + 'linux-06.ih-eu-mda1.nimbus.mainnet': # Doesn't exist yet. - { branch: 'stable', num: 1 } - { branch: 'stable', num: 2 } - { branch: 'testing', num: 1 } @@ -158,7 +158,7 @@ nodes_layout: - { branch: 'unstable', num: 1 } - { branch: 'unstable', num: 2 } - 'linux-07.ih-eu-mda1.nimbus.mainnet': + 'linux-07.ih-eu-mda1.nimbus.mainnet': # Doesn't exist yet. - { branch: 'stable', num: 1 } - { branch: 'libp2p', num: 1 } - { branch: 'libp2p', num: 2 } @@ -167,54 +167,6 @@ nodes_layout: # Hetzner ---------------------------------------------------------- 'metal-01.he-eu-hel1.nimbus.mainnet': - - { branch: 'stable', num: 1 } - - { branch: 'stable', num: 2 } - - { branch: 'testing', num: 1, open_libp2p_ports: false } - - { branch: 'testing', num: 2 } - - { branch: 'unstable', num: 1, public_api: true } - - { branch: 'unstable', num: 2 } - - 'metal-02.he-eu-hel1.nimbus.mainnet': - - { branch: 'stable', num: 1 } - - { branch: 'stable', num: 2 } - - { branch: 'testing', num: 1, public_api: true } - - { branch: 'testing', num: 2 } - - { branch: 'unstable', num: 1, open_libp2p_ports: false } - - { branch: 'unstable', num: 2 } - - 'metal-03.he-eu-hel1.nimbus.mainnet': - - { branch: 'stable', num: 1 } - - { branch: 'stable', num: 2 } - - { branch: 'testing', num: 1 } - - { branch: 'testing', num: 2 } - - { branch: 'unstable', num: 1 } - - { branch: 'unstable', num: 2 } - - 'metal-04.he-eu-hel1.nimbus.mainnet': - - { branch: 'stable', num: 1 } - - { branch: 'stable', num: 2 } - - { branch: 'testing', num: 1 } - - { branch: 'testing', num: 2 } - - { branch: 'unstable', num: 1 } - - { branch: 'unstable', num: 2 } - - 'metal-05.he-eu-hel1.nimbus.mainnet': - - { branch: 'stable', num: 1 } - - { branch: 'stable', num: 2 } - - { branch: 'testing', num: 1 } - - { branch: 'testing', num: 2 } - - { branch: 'unstable', num: 1 } - - { branch: 'unstable', num: 2 } - - 'metal-06.he-eu-hel1.nimbus.mainnet': - - { branch: 'stable', num: 1 } - - { branch: 'stable', num: 2 } - - { branch: 'testing', num: 1 } - - { branch: 'testing', num: 2 } - - { branch: 'unstable', num: 1 } - - { branch: 'unstable', num: 2 } - - 'metal-07.he-eu-hel1.nimbus.mainnet': - { branch: 'stable', num: 1 } - { branch: 'libp2p', num: 1 } - { branch: 'libp2p', num: 2 } diff --git a/ansible/inventory/test b/ansible/inventory/test index 1ca3201..f108ed6 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -21,14 +21,8 @@ macos-01.ms-eu-dublin.nimbus.prater hostname=macos-01.ms-eu-dublin.nimbus.prater mainnet-01.aws-eu-central-1a.nimbus.geth hostname=mainnet-01.aws-eu-central-1a.nimbus.geth ansible_host=18.196.208.138 env=nimbus stage=geth data_center=aws-eu-central-1a region=eu-central-1a dns_entry=mainnet-01.aws-eu-central-1a.nimbus.geth.statusim.net metal-01.he-eu-hel1.nimbus.eth1 hostname=metal-01.he-eu-hel1.nimbus.eth1 ansible_host=65.21.230.244 env=nimbus stage=eth1 data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-01.he-eu-hel1.nimbus.eth1.statusim.net metal-01.he-eu-hel1.nimbus.fluffy hostname=metal-01.he-eu-hel1.nimbus.fluffy ansible_host=65.108.42.3 env=nimbus stage=fluffy data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-01.he-eu-hel1.nimbus.fluffy.statusim.net -metal-01.he-eu-hel1.nimbus.mainnet hostname=metal-01.he-eu-hel1.nimbus.mainnet ansible_host=95.217.87.121 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-01.he-eu-hel1.nimbus.mainnet.statusim.net +metal-01.he-eu-hel1.nimbus.mainnet hostname=metal-01.he-eu-hel1.nimbus.mainnet ansible_host=65.109.80.106 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-01.he-eu-hel1.nimbus.mainnet.statusim.net metal-02.he-eu-hel1.nimbus.fluffy hostname=metal-02.he-eu-hel1.nimbus.fluffy ansible_host=65.108.42.174 env=nimbus stage=fluffy data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-02.he-eu-hel1.nimbus.fluffy.statusim.net -metal-02.he-eu-hel1.nimbus.mainnet hostname=metal-02.he-eu-hel1.nimbus.mainnet ansible_host=135.181.0.33 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-02.he-eu-hel1.nimbus.mainnet.statusim.net -metal-03.he-eu-hel1.nimbus.mainnet hostname=metal-03.he-eu-hel1.nimbus.mainnet ansible_host=135.181.60.170 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-03.he-eu-hel1.nimbus.mainnet.statusim.net -metal-04.he-eu-hel1.nimbus.mainnet hostname=metal-04.he-eu-hel1.nimbus.mainnet ansible_host=65.21.193.229 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-04.he-eu-hel1.nimbus.mainnet.statusim.net -metal-05.he-eu-hel1.nimbus.mainnet hostname=metal-05.he-eu-hel1.nimbus.mainnet ansible_host=135.181.60.177 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-05.he-eu-hel1.nimbus.mainnet.statusim.net -metal-06.he-eu-hel1.nimbus.mainnet hostname=metal-06.he-eu-hel1.nimbus.mainnet ansible_host=135.181.56.50 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-06.he-eu-hel1.nimbus.mainnet.statusim.net -metal-07.he-eu-hel1.nimbus.mainnet hostname=metal-07.he-eu-hel1.nimbus.mainnet ansible_host=65.109.80.106 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-07.he-eu-hel1.nimbus.mainnet.statusim.net node-01.aws-eu-central-1a.dash.nimbus hostname=node-01.aws-eu-central-1a.dash.nimbus ansible_host=52.28.100.116 env=dash stage=nimbus data_center=aws-eu-central-1a region=eu-central-1a dns_entry=node-01.aws-eu-central-1a.dash.nimbus.statusim.net stable-large-01.aws-eu-central-1a.nimbus.prater hostname=stable-large-01.aws-eu-central-1a.nimbus.prater ansible_host=3.120.202.252 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-large-01.aws-eu-central-1a.nimbus.prater.statusim.net stable-small-01.aws-eu-central-1a.nimbus.mainnet hostname=stable-small-01.aws-eu-central-1a.nimbus.mainnet ansible_host=3.120.104.18 env=nimbus stage=mainnet data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-small-01.aws-eu-central-1a.nimbus.mainnet.statusim.net @@ -67,12 +61,6 @@ metal-01.he-eu-hel1.nimbus.eth1 metal-01.he-eu-hel1.nimbus.fluffy metal-01.he-eu-hel1.nimbus.mainnet metal-02.he-eu-hel1.nimbus.fluffy -metal-02.he-eu-hel1.nimbus.mainnet -metal-03.he-eu-hel1.nimbus.mainnet -metal-04.he-eu-hel1.nimbus.mainnet -metal-05.he-eu-hel1.nimbus.mainnet -metal-06.he-eu-hel1.nimbus.mainnet -metal-07.he-eu-hel1.nimbus.mainnet store-01.he-eu-hel1.logs.nimbus store-02.he-eu-hel1.logs.nimbus store-03.he-eu-hel1.logs.nimbus @@ -119,12 +107,6 @@ linux-03.ih-eu-mda1.nimbus.mainnet linux-04.ih-eu-mda1.nimbus.mainnet linux-05.ih-eu-mda1.nimbus.mainnet metal-01.he-eu-hel1.nimbus.mainnet -metal-02.he-eu-hel1.nimbus.mainnet -metal-03.he-eu-hel1.nimbus.mainnet -metal-04.he-eu-hel1.nimbus.mainnet -metal-05.he-eu-hel1.nimbus.mainnet -metal-06.he-eu-hel1.nimbus.mainnet -metal-07.he-eu-hel1.nimbus.mainnet [nimbus-mainnet-small] stable-small-01.aws-eu-central-1a.nimbus.mainnet @@ -177,12 +159,6 @@ linux-03.ih-eu-mda1.nimbus.mainnet linux-04.ih-eu-mda1.nimbus.mainnet linux-05.ih-eu-mda1.nimbus.mainnet metal-01.he-eu-hel1.nimbus.mainnet -metal-02.he-eu-hel1.nimbus.mainnet -metal-03.he-eu-hel1.nimbus.mainnet -metal-04.he-eu-hel1.nimbus.mainnet -metal-05.he-eu-hel1.nimbus.mainnet -metal-06.he-eu-hel1.nimbus.mainnet -metal-07.he-eu-hel1.nimbus.mainnet stable-small-01.aws-eu-central-1a.nimbus.mainnet stable-small-02.aws-eu-central-1a.nimbus.mainnet diff --git a/mainnet.tf b/mainnet.tf index b4824ee..7986295 100644 --- a/mainnet.tf +++ b/mainnet.tf @@ -14,13 +14,7 @@ module "nimbus_nodes_mainnet_hetzner" { domain = var.domain ips = [ - "95.217.87.121", /* metal-01.he-eu-hel1.nimbus.mainnet */ - "135.181.0.33", /* metal-02.he-eu-hel1.nimbus.mainnet */ - "135.181.60.170", /* metal-03.he-eu-hel1.nimbus.mainnet */ - "65.21.193.229", /* metal-04.he-eu-hel1.nimbus.mainnet */ - "135.181.60.177", /* metal-05.he-eu-hel1.nimbus.mainnet */ - "135.181.56.50", /* metal-06.he-eu-hel1.nimbus.mainnet */ - "65.109.80.106", /* metal-07.he-eu-hel1.nimbus.mainnet */ + "65.109.80.106", /* metal-01.he-eu-hel1.nimbus.mainnet */ ] } @@ -48,7 +42,7 @@ module "nimbus_nodes_mainnet_innova" { resource "cloudflare_record" "unstable_mainnet_beacon_api" { zone_id = local.zones["nimbus.team"] name = "unstable.mainnet.beacon-api" - value = module.nimbus_nodes_mainnet_hetzner.public_ips[0] + value = module.nimbus_nodes_mainnet_innova.public_ips[0] type = "A" proxied = false } @@ -56,7 +50,7 @@ resource "cloudflare_record" "unstable_mainnet_beacon_api" { resource "cloudflare_record" "testing_mainnet_beacon_api" { zone_id = local.zones["nimbus.team"] name = "testing.mainnet.beacon-api" - value = module.nimbus_nodes_mainnet_hetzner.public_ips[1] + value = module.nimbus_nodes_mainnet_innova.public_ips[1] type = "A" proxied = false } @@ -65,7 +59,7 @@ resource "cloudflare_record" "testing_mainnet_beacon_api" { resource "cloudflare_record" "era_mainnet" { zone_id = local.zones["nimbus.team"] name = "mainnet.era" - value = module.nimbus_nodes_mainnet_hetzner.public_ips[2] + value = module.nimbus_nodes_mainnet_innova.public_ips[2] type = "A" proxied = true }