From 6ed5081087542ec2fc62f2d4d7ac5f8c4ee124e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 5 Oct 2021 15:35:19 +0200 Subject: [PATCH] nimbus.prater: move validators from 03 nodes to metal-02 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.prater.yml | 20 +++++++------------- ansible/inventory/test | 12 ------------ prater.tf | 6 +++--- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 30c1006..955fbc2 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -34,26 +34,20 @@ nodes_layout: - { branch: 'stable', start: 0, end: 2500 } 'stable-large-02.aws-eu-central-1a.nimbus.prater': - { branch: 'stable', start: 2500, end: 5000 } - 'stable-large-03.aws-eu-central-1a.nimbus.prater': - - { branch: 'stable', start: 5000, end: 7500 } # 2500 validators per node 'testing-large-01.aws-eu-central-1a.nimbus.prater': - { branch: 'testing', start: 12500, end: 15000 } 'testing-large-02.aws-eu-central-1a.nimbus.prater': - { branch: 'testing', start: 15000, end: 17500 } - 'testing-large-03.aws-eu-central-1a.nimbus.prater': - - { branch: 'testing', start: 17500, end: 20000 } # 2500 validators per node - "unstable-large-01.aws-eu-central-1a.nimbus.prater": + 'unstable-large-01.aws-eu-central-1a.nimbus.prater': - { branch: 'unstable', start: 25000, end: 27500 } - "unstable-large-02.aws-eu-central-1a.nimbus.prater": + 'unstable-large-02.aws-eu-central-1a.nimbus.prater': - { branch: 'unstable', start: 27500, end: 30000 } - "unstable-large-03.aws-eu-central-1a.nimbus.prater": - - { branch: 'unstable', start: 30000, end: 32500 } - # 2500 validators per node + # 2500 validators per first node 'metal-01.he-eu-hel1.nimbus.prater': - { branch: 'stable', num: 1, start: 10000, end: 12500, build_freq: '*-*-* 12:00:00' } - { branch: 'stable', num: 2, build_freq: '*-*-* 13:00:00' } @@ -62,13 +56,13 @@ nodes_layout: - { branch: 'unstable', num: 1, start: 35000, end: 37500, build_freq: '*-*-* 16:00:00' } - { branch: 'unstable', num: 2, build_freq: '*-*-* 17:00:00' } - # 2500 validators per node + # 2500 validators per first node 'metal-02.he-eu-hel1.nimbus.prater': - - { branch: 'stable', num: 1, build_freq: '*-*-* 12:00:00' } + - { branch: 'stable', num: 1, start: 5000, end: 7500, build_freq: '*-*-* 12:00:00' } - { branch: 'stable', num: 2, build_freq: '*-*-* 13:00:00' } - - { branch: 'testing', num: 1, build_freq: '*-*-* 14:00:00' } + - { branch: 'testing', num: 1, start: 17500, end: 20000, build_freq: '*-*-* 14:00:00' } - { branch: 'testing', num: 2, build_freq: '*-*-* 15:00:00' } - - { branch: 'unstable', num: 1, build_freq: '*-*-* 16:00:00' } + - { branch: 'unstable', num: 1, start: 30000, end: 32500, build_freq: '*-*-* 16:00:00' } - { branch: 'unstable', num: 2, build_freq: '*-*-* 17:00:00' } # 2500 validators per node diff --git a/ansible/inventory/test b/ansible/inventory/test index 1195e49..480f177 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -23,17 +23,14 @@ node-02.aws-eu-central-1a.log-store.nimbus hostname=node-02.aws-eu-central-1a.lo node-03.aws-eu-central-1a.log-store.nimbus hostname=node-03.aws-eu-central-1a.log-store.nimbus ansible_host=18.156.65.18 env=log-store stage=nimbus data_center=aws-eu-central-1a region=eu-central-1a dns_entry=node-03.aws-eu-central-1a.log-store.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-large-02.aws-eu-central-1a.nimbus.prater hostname=stable-large-02.aws-eu-central-1a.nimbus.prater ansible_host=3.65.99.236 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-large-02.aws-eu-central-1a.nimbus.prater.statusim.net -stable-large-03.aws-eu-central-1a.nimbus.prater hostname=stable-large-03.aws-eu-central-1a.nimbus.prater ansible_host=3.64.72.159 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-large-03.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 stable-small-02.aws-eu-central-1a.nimbus.mainnet hostname=stable-small-02.aws-eu-central-1a.nimbus.mainnet ansible_host=3.64.117.223 env=nimbus stage=mainnet data_center=aws-eu-central-1a region=eu-central-1a dns_entry=stable-small-02.aws-eu-central-1a.nimbus.mainnet.statusim.net testing-large-01.aws-eu-central-1a.nimbus.prater hostname=testing-large-01.aws-eu-central-1a.nimbus.prater ansible_host=18.195.151.76 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=testing-large-01.aws-eu-central-1a.nimbus.prater.statusim.net testing-large-02.aws-eu-central-1a.nimbus.prater hostname=testing-large-02.aws-eu-central-1a.nimbus.prater ansible_host=18.158.6.76 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=testing-large-02.aws-eu-central-1a.nimbus.prater.statusim.net -testing-large-03.aws-eu-central-1a.nimbus.prater hostname=testing-large-03.aws-eu-central-1a.nimbus.prater ansible_host=18.157.146.243 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=testing-large-03.aws-eu-central-1a.nimbus.prater.statusim.net u-libp2p-s-large-01.aws-eu-central-1a.nimbus.prater hostname=u-libp2p-s-large-01.aws-eu-central-1a.nimbus.prater ansible_host=3.65.85.93 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=u-libp2p-s-large-01.aws-eu-central-1a.nimbus.prater.statusim.net u-libp2p-u-large-01.aws-eu-central-1a.nimbus.prater hostname=u-libp2p-u-large-01.aws-eu-central-1a.nimbus.prater ansible_host=18.158.170.20 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=u-libp2p-u-large-01.aws-eu-central-1a.nimbus.prater.statusim.net unstable-large-01.aws-eu-central-1a.nimbus.prater hostname=unstable-large-01.aws-eu-central-1a.nimbus.prater ansible_host=3.65.85.130 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=unstable-large-01.aws-eu-central-1a.nimbus.prater.statusim.net unstable-large-02.aws-eu-central-1a.nimbus.prater hostname=unstable-large-02.aws-eu-central-1a.nimbus.prater ansible_host=3.65.180.246 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=unstable-large-02.aws-eu-central-1a.nimbus.prater.statusim.net -unstable-large-03.aws-eu-central-1a.nimbus.prater hostname=unstable-large-03.aws-eu-central-1a.nimbus.prater ansible_host=18.198.64.62 env=nimbus stage=prater data_center=aws-eu-central-1a region=eu-central-1a dns_entry=unstable-large-03.aws-eu-central-1a.nimbus.prater.statusim.net windows-01.gc-us-central1-a.nimbus.prater hostname=windows-01.gc-us-central1-a.nimbus.prater ansible_host=35.232.80.244 env=nimbus stage=prater data_center=gc-us-central1-a region=us-central1-a dns_entry=windows-01.gc-us-central1-a.nimbus.prater.statusim.net [aws-eu-central-1a] @@ -45,17 +42,14 @@ node-02.aws-eu-central-1a.log-store.nimbus node-03.aws-eu-central-1a.log-store.nimbus stable-large-01.aws-eu-central-1a.nimbus.prater stable-large-02.aws-eu-central-1a.nimbus.prater -stable-large-03.aws-eu-central-1a.nimbus.prater stable-small-01.aws-eu-central-1a.nimbus.mainnet stable-small-02.aws-eu-central-1a.nimbus.mainnet testing-large-01.aws-eu-central-1a.nimbus.prater testing-large-02.aws-eu-central-1a.nimbus.prater -testing-large-03.aws-eu-central-1a.nimbus.prater u-libp2p-s-large-01.aws-eu-central-1a.nimbus.prater u-libp2p-u-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater unstable-large-02.aws-eu-central-1a.nimbus.prater -unstable-large-03.aws-eu-central-1a.nimbus.prater [dash.nimbus] node-01.aws-eu-central-1a.dash.nimbus @@ -125,17 +119,14 @@ metal-02.he-eu-hel1.nimbus.prater [nimbus-prater-stable] stable-large-01.aws-eu-central-1a.nimbus.prater stable-large-02.aws-eu-central-1a.nimbus.prater -stable-large-03.aws-eu-central-1a.nimbus.prater [nimbus-prater-testing] testing-large-01.aws-eu-central-1a.nimbus.prater testing-large-02.aws-eu-central-1a.nimbus.prater -testing-large-03.aws-eu-central-1a.nimbus.prater [nimbus-prater-unstable] unstable-large-01.aws-eu-central-1a.nimbus.prater unstable-large-02.aws-eu-central-1a.nimbus.prater -unstable-large-03.aws-eu-central-1a.nimbus.prater [nimbus-prater-unstable-libp2p-stable] u-libp2p-s-large-01.aws-eu-central-1a.nimbus.prater @@ -175,15 +166,12 @@ metal-01.he-eu-hel1.nimbus.prater metal-02.he-eu-hel1.nimbus.prater stable-large-01.aws-eu-central-1a.nimbus.prater stable-large-02.aws-eu-central-1a.nimbus.prater -stable-large-03.aws-eu-central-1a.nimbus.prater testing-large-01.aws-eu-central-1a.nimbus.prater testing-large-02.aws-eu-central-1a.nimbus.prater -testing-large-03.aws-eu-central-1a.nimbus.prater u-libp2p-s-large-01.aws-eu-central-1a.nimbus.prater u-libp2p-u-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater unstable-large-02.aws-eu-central-1a.nimbus.prater -unstable-large-03.aws-eu-central-1a.nimbus.prater windows-01.gc-us-central1-a.nimbus.prater [nimbus.pyrmont] diff --git a/prater.tf b/prater.tf index 90b0433..c271a54 100644 --- a/prater.tf +++ b/prater.tf @@ -23,7 +23,7 @@ module "nimbus_nodes_prater_stable_large" { data_vol_size = local.prater_data_vol_size data_vol_type = local.prater_data_vol_type data_vol_iops = local.prater_data_vol_iops - host_count = 3 + host_count = 2 /* Firewall */ open_udp_ports = local.nimbus_ports @@ -51,7 +51,7 @@ module "nimbus_nodes_prater_testing_large" { data_vol_size = local.prater_data_vol_size data_vol_type = local.prater_data_vol_type data_vol_iops = local.prater_data_vol_iops - host_count = 3 + host_count = 2 /* Firewall */ open_udp_ports = local.nimbus_ports @@ -79,7 +79,7 @@ module "nimbus_nodes_prater_unstable_large" { data_vol_size = local.prater_data_vol_size data_vol_type = local.prater_data_vol_type data_vol_iops = local.prater_data_vol_iops - host_count = 3 + host_count = 2 /* Firewall */ open_udp_ports = local.nimbus_ports