From 0256a21dd0c04eac5cdf39a258c1f4342eca5110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 9 May 2023 15:07:22 +0200 Subject: [PATCH] nimbus.mainnet: add two more hosts from Innova MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `linux-06` is a new host, while `linux-07` is re-purposed `linux-01` from the prater fleet. This is done because the Innova company is out of Xeon E5-2690 CPUs, and we want consistent performance across the fleet. This way all seven hosts in `nimbus.mainnet` will use the E5-2690 CPU. https://github.com/status-im/infra-nimbus/issues/132 Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.prater.yml | 6 ------ ansible/inventory/test | 12 ++++++++---- mainnet.tf | 12 +++++++----- prater.tf | 17 ----------------- 4 files changed, 15 insertions(+), 32 deletions(-) diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 4ea7795..8052ef9 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -181,12 +181,6 @@ nodes_layout: - { branch: 'testing', start: 16000, end: 18000, build_start: '15:00:00' } - { branch: 'unstable', start: 18000, end: 20000, build_start: '16:00:00', nim_flags: '-d:json_rpc_websocket_package=websock' } - 'linux-01.ih-eu-mda1.nimbus.prater': # 0 each - - { branch: 'stable', build_freq: '*-*-* 13:00:00' } - - { branch: 'testing', build_freq: '*-*-* 15:00:00', nim_commit: 'version-1-6' } - - { branch: 'unstable', build_freq: '*-*-* 17:00:00', public_api: true } - - { branch: 'libp2p', build_freq: '*-*-* 19:00:00' } - 'linux-01.he-eu-hel1.nimbus.prater': # 0 each - { branch: 'stable', build_freq: '*-*-* 13:00:00' } - { branch: 'testing', build_freq: '*-*-* 15:00:00', nim_commit: 'version-1-6' } diff --git a/ansible/inventory/test b/ansible/inventory/test index f108ed6..f7f79e7 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -7,7 +7,6 @@ goerli-03.he-eu-hel1.nimbus.geth hostname=goerli-03.he-eu-hel1.nimbus.geth ansib linux-01.he-eu-hel1.nimbus.prater hostname=linux-01.he-eu-hel1.nimbus.prater ansible_host=95.217.198.113 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-01.he-eu-hel1.nimbus.prater.statusim.net linux-01.he-eu-hel1.nimbus.sepolia hostname=linux-01.he-eu-hel1.nimbus.sepolia ansible_host=65.21.89.157 env=nimbus stage=sepolia data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-01.he-eu-hel1.nimbus.sepolia.statusim.net linux-01.ih-eu-mda1.nimbus.mainnet hostname=linux-01.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.70 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-01.ih-eu-mda1.nimbus.mainnet.statusim.net -linux-01.ih-eu-mda1.nimbus.prater hostname=linux-01.ih-eu-mda1.nimbus.prater ansible_host=185.181.229.82 env=nimbus stage=prater data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-01.ih-eu-mda1.nimbus.prater.statusim.net linux-02.he-eu-hel1.nimbus.prater hostname=linux-02.he-eu-hel1.nimbus.prater ansible_host=95.217.230.20 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-02.he-eu-hel1.nimbus.prater.statusim.net linux-02.ih-eu-mda1.nimbus.mainnet hostname=linux-02.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.72 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-02.ih-eu-mda1.nimbus.mainnet.statusim.net linux-03.he-eu-hel1.nimbus.prater hostname=linux-03.he-eu-hel1.nimbus.prater ansible_host=65.108.132.230 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-03.he-eu-hel1.nimbus.prater.statusim.net @@ -17,6 +16,8 @@ linux-04.ih-eu-mda1.nimbus.mainnet hostname=linux-04.ih-eu-mda1.nimbus.mainnet a linux-05.he-eu-hel1.nimbus.prater hostname=linux-05.he-eu-hel1.nimbus.prater ansible_host=95.217.224.92 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-05.he-eu-hel1.nimbus.prater.statusim.net linux-05.ih-eu-mda1.nimbus.mainnet hostname=linux-05.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.100 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-05.ih-eu-mda1.nimbus.mainnet.statusim.net linux-06.he-eu-hel1.nimbus.prater hostname=linux-06.he-eu-hel1.nimbus.prater ansible_host=95.217.204.216 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=linux-06.he-eu-hel1.nimbus.prater.statusim.net +linux-06.ih-eu-mda1.nimbus.mainnet hostname=linux-06.ih-eu-mda1.nimbus.mainnet ansible_host=194.33.40.101 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-06.ih-eu-mda1.nimbus.mainnet.statusim.net +linux-07.ih-eu-mda1.nimbus.mainnet hostname=linux-07.ih-eu-mda1.nimbus.mainnet ansible_host=185.181.229.82 env=nimbus stage=mainnet data_center=ih-eu-mda1 region=eu-mda1 dns_entry=linux-07.ih-eu-mda1.nimbus.mainnet.statusim.net macos-01.ms-eu-dublin.nimbus.prater hostname=macos-01.ms-eu-dublin.nimbus.prater ansible_host=207.254.102.98 env=nimbus stage=prater data_center=ms-eu-dublin region=eu-dublin dns_entry=macos-01.ms-eu-dublin.nimbus.prater.statusim.net 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 @@ -68,11 +69,12 @@ windows-01.he-eu-hel1.nimbus.prater [ih-eu-mda1] linux-01.ih-eu-mda1.nimbus.mainnet -linux-01.ih-eu-mda1.nimbus.prater linux-02.ih-eu-mda1.nimbus.mainnet linux-03.ih-eu-mda1.nimbus.mainnet linux-04.ih-eu-mda1.nimbus.mainnet linux-05.ih-eu-mda1.nimbus.mainnet +linux-06.ih-eu-mda1.nimbus.mainnet +linux-07.ih-eu-mda1.nimbus.mainnet [log-dash] node-01.aws-eu-central-1a.dash.nimbus @@ -106,6 +108,8 @@ linux-02.ih-eu-mda1.nimbus.mainnet linux-03.ih-eu-mda1.nimbus.mainnet linux-04.ih-eu-mda1.nimbus.mainnet linux-05.ih-eu-mda1.nimbus.mainnet +linux-06.ih-eu-mda1.nimbus.mainnet +linux-07.ih-eu-mda1.nimbus.mainnet metal-01.he-eu-hel1.nimbus.mainnet [nimbus-mainnet-small] @@ -117,7 +121,6 @@ macos-01.ms-eu-dublin.nimbus.prater [nimbus-prater-metal] linux-01.he-eu-hel1.nimbus.prater -linux-01.ih-eu-mda1.nimbus.prater linux-02.he-eu-hel1.nimbus.prater linux-03.he-eu-hel1.nimbus.prater linux-04.he-eu-hel1.nimbus.prater @@ -158,13 +161,14 @@ linux-02.ih-eu-mda1.nimbus.mainnet linux-03.ih-eu-mda1.nimbus.mainnet linux-04.ih-eu-mda1.nimbus.mainnet linux-05.ih-eu-mda1.nimbus.mainnet +linux-06.ih-eu-mda1.nimbus.mainnet +linux-07.ih-eu-mda1.nimbus.mainnet metal-01.he-eu-hel1.nimbus.mainnet stable-small-01.aws-eu-central-1a.nimbus.mainnet stable-small-02.aws-eu-central-1a.nimbus.mainnet [nimbus.prater] linux-01.he-eu-hel1.nimbus.prater -linux-01.ih-eu-mda1.nimbus.prater linux-02.he-eu-hel1.nimbus.prater linux-03.he-eu-hel1.nimbus.prater linux-04.he-eu-hel1.nimbus.prater diff --git a/mainnet.tf b/mainnet.tf index 7986295..aecc371 100644 --- a/mainnet.tf +++ b/mainnet.tf @@ -30,11 +30,13 @@ module "nimbus_nodes_mainnet_innova" { domain = var.domain ips = [ - "194.33.40.70", /* linux-01.ih-eu-mda1.nimbus.mainnet */ - "194.33.40.72", /* linux-02.ih-eu-mda1.nimbus.mainnet */ - "194.33.40.78", /* linux-03.ih-eu-mda1.nimbus.mainnet */ - "194.33.40.99", /* linux-04.ih-eu-mda1.nimbus.mainnet */ - "194.33.40.100", /* linux-05.ih-eu-mda1.nimbus.mainnet */ + "194.33.40.70", /* linux-01.ih-eu-mda1.nimbus.mainnet */ + "194.33.40.72", /* linux-02.ih-eu-mda1.nimbus.mainnet */ + "194.33.40.78", /* linux-03.ih-eu-mda1.nimbus.mainnet */ + "194.33.40.99", /* linux-04.ih-eu-mda1.nimbus.mainnet */ + "194.33.40.100", /* linux-05.ih-eu-mda1.nimbus.mainnet */ + "194.33.40.101", /* linux-06.ih-eu-mda1.nimbus.mainnet */ + "185.181.229.82", /* linux-07.ih-eu-mda1.nimbus.mainnet */ ] } diff --git a/prater.tf b/prater.tf index 676ed32..5b4c828 100644 --- a/prater.tf +++ b/prater.tf @@ -130,23 +130,6 @@ module "nimbus_nodes_prater_hetzner" { ] } -/* Possible future alternative to Hetzner */ -module "nimbus_nodes_prater_innova_servers" { - source = "github.com/status-im/infra-tf-dummy-module" - - name = "linux" - env = "nimbus" - stage = "prater" - group = "nimbus-prater-metal" - region = "eu-mda1" - prefix = "ih" - domain = var.domain - - ips = [ - "185.181.229.82", # linux-01.ih-eu-mda1.nimbus.prater - ] -} - /* Community test REST API endpoints. */ resource "cloudflare_record" "unstable_prater_beacon_api" { zone_id = local.zones["nimbus.team"]