From ec65bac02adbbd041b13d6d6002a638b6aef22d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 10 Feb 2022 21:33:52 +0100 Subject: [PATCH] nimbus.pyrmont: drop two nodes and move validators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two nodes will be reused in the Prater fleet. Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.pyrmont.yml | 21 ++++++--------------- ansible/inventory/test | 16 ++++++++-------- prater.tf | 2 ++ pyrmont.tf | 6 ++---- 4 files changed, 18 insertions(+), 27 deletions(-) diff --git a/ansible/group_vars/nimbus.pyrmont.yml b/ansible/group_vars/nimbus.pyrmont.yml index fbf8f07..d5e912d 100644 --- a/ansible/group_vars/nimbus.pyrmont.yml +++ b/ansible/group_vars/nimbus.pyrmont.yml @@ -36,18 +36,9 @@ nodes_layout: - { branch: 'unstable', start: 4000, end: 8000, build_frequency: '*-*-* 13:00:00', public_api: true } - { branch: 'testing', start: 8000, end: 12000, build_frequency: '*-*-* 15:00:00' } - { branch: 'libp2p', start: 12000, end: 16000, build_frequency: '*-*-* 17:00:00' } - 'metal-02.he-eu-hel1.nimbus.pyrmont': # 989 validators each - - { branch: 'stable', start: 16000, end: 16989, build_frequency: '*-*-* 11:00:00' } - - { branch: 'unstable', start: 16989, end: 17978, build_frequency: '*-*-* 13:00:00' } - - { branch: 'testing', start: 17978, end: 18967, build_frequency: '*-*-* 15:00:00' } - - { branch: 'libp2p', start: 18967, end: 19956, build_frequency: '*-*-* 17:00:00' } - 'metal-03.he-eu-hel1.nimbus.pyrmont': # 10 validators each - - { branch: 'stable', start: 19956, end: 19966, build_frequency: '*-*-* 11:00:00' } - - { branch: 'unstable', start: 19966, end: 19976, build_frequency: '*-*-* 13:00:00' } - - { branch: 'testing', start: 19976, end: 19986, build_frequency: '*-*-* 15:00:00' } - - { branch: 'libp2p', start: 19986, end: 19996, build_frequency: '*-*-* 17:00:00' } - 'metal-04.he-eu-hel1.nimbus.pyrmont': # 2 validators each - - { branch: 'stable', start: 19996, end: 19997, build_frequency: '*-*-* 11:00:00' } - - { branch: 'unstable', start: 19997, end: 19998, build_frequency: '*-*-* 13:00:00' } - - { branch: 'testing', start: 19998, end: 19999, build_frequency: '*-*-* 15:00:00' } - - { branch: 'libp2p', start: 19999, end: 20000, build_frequency: '*-*-* 17:00:00' } + + 'metal-02.he-eu-hel1.nimbus.pyrmont': # 1000 validators each + - { branch: 'stable', start: 16000, end: 17000, build_frequency: '*-*-* 11:00:00' } + - { branch: 'unstable', start: 17000, end: 18000, build_frequency: '*-*-* 13:00:00' } + - { branch: 'testing', start: 18000, end: 19000, build_frequency: '*-*-* 15:00:00' } + - { branch: 'libp2p', start: 19000, end: 20000, build_frequency: '*-*-* 17:00:00' } diff --git a/ansible/inventory/test b/ansible/inventory/test index 928d920..c9b3eaf 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -12,9 +12,9 @@ metal-02.he-eu-hel1.nimbus.mainnet hostname=metal-02.he-eu-hel1.nimbus.mainnet a metal-02.he-eu-hel1.nimbus.prater hostname=metal-02.he-eu-hel1.nimbus.prater ansible_host=65.108.5.45 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-02.he-eu-hel1.nimbus.prater.statusim.net metal-02.he-eu-hel1.nimbus.pyrmont hostname=metal-02.he-eu-hel1.nimbus.pyrmont ansible_host=65.21.196.46 env=nimbus stage=pyrmont data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-02.he-eu-hel1.nimbus.pyrmont.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-03.he-eu-hel1.nimbus.pyrmont hostname=metal-03.he-eu-hel1.nimbus.pyrmont ansible_host=65.21.196.47 env=nimbus stage=pyrmont data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-03.he-eu-hel1.nimbus.pyrmont.statusim.net +metal-03.he-eu-hel1.nimbus.prater hostname=metal-03.he-eu-hel1.nimbus.prater ansible_host=65.21.196.47 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-03.he-eu-hel1.nimbus.prater.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-04.he-eu-hel1.nimbus.pyrmont hostname=metal-04.he-eu-hel1.nimbus.pyrmont ansible_host=65.21.196.48 env=nimbus stage=pyrmont data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-04.he-eu-hel1.nimbus.pyrmont.statusim.net +metal-04.he-eu-hel1.nimbus.prater hostname=metal-04.he-eu-hel1.nimbus.prater ansible_host=65.21.196.48 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-04.he-eu-hel1.nimbus.prater.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 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 @@ -53,9 +53,9 @@ metal-02.he-eu-hel1.nimbus.mainnet metal-02.he-eu-hel1.nimbus.prater metal-02.he-eu-hel1.nimbus.pyrmont metal-03.he-eu-hel1.nimbus.mainnet -metal-03.he-eu-hel1.nimbus.pyrmont +metal-03.he-eu-hel1.nimbus.prater metal-04.he-eu-hel1.nimbus.mainnet -metal-04.he-eu-hel1.nimbus.pyrmont +metal-04.he-eu-hel1.nimbus.prater metal-05.he-eu-hel1.nimbus.mainnet metal-06.he-eu-hel1.nimbus.mainnet store-01.he-eu-hel1.logs.nimbus @@ -100,6 +100,8 @@ macos-01.ms-eu-dublin.nimbus.prater [nimbus-prater-metal] metal-01.he-eu-hel1.nimbus.prater metal-02.he-eu-hel1.nimbus.prater +metal-03.he-eu-hel1.nimbus.prater +metal-04.he-eu-hel1.nimbus.prater [nimbus-prater-stable] stable-large-01.aws-eu-central-1a.nimbus.prater @@ -116,8 +118,6 @@ windows-01.gc-us-central1-a.nimbus.prater [nimbus-pyrmont-metal] metal-01.he-eu-hel1.nimbus.pyrmont metal-02.he-eu-hel1.nimbus.pyrmont -metal-03.he-eu-hel1.nimbus.pyrmont -metal-04.he-eu-hel1.nimbus.pyrmont [nimbus.eth1] metal-01.he-eu-hel1.nimbus.eth1 @@ -140,6 +140,8 @@ stable-small-02.aws-eu-central-1a.nimbus.mainnet macos-01.ms-eu-dublin.nimbus.prater metal-01.he-eu-hel1.nimbus.prater metal-02.he-eu-hel1.nimbus.prater +metal-03.he-eu-hel1.nimbus.prater +metal-04.he-eu-hel1.nimbus.prater stable-large-01.aws-eu-central-1a.nimbus.prater testing-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater @@ -148,6 +150,4 @@ windows-01.gc-us-central1-a.nimbus.prater [nimbus.pyrmont] metal-01.he-eu-hel1.nimbus.pyrmont metal-02.he-eu-hel1.nimbus.pyrmont -metal-03.he-eu-hel1.nimbus.pyrmont -metal-04.he-eu-hel1.nimbus.pyrmont diff --git a/prater.tf b/prater.tf index 33df14f..30cafc8 100644 --- a/prater.tf +++ b/prater.tf @@ -119,6 +119,8 @@ module "nimbus_nodes_prater_hetzner" { ips = [ "65.21.73.183", # metal-01.he-eu-hel1.nimbus.prater "65.108.5.45", # metal-02.he-eu-hel1.nimbus.prater + "65.21.196.47", # metal-03.he-eu-hel1.nimbus.prater + "65.21.196.48", # metal-04.he-eu-hel1.nimbus.prater ] } diff --git a/pyrmont.tf b/pyrmont.tf index 589e218..3100393 100644 --- a/pyrmont.tf +++ b/pyrmont.tf @@ -12,10 +12,8 @@ module "nimbus_nodes_pyrmont_hetzner" { domain = var.domain ips = [ - "65.21.196.45", - "65.21.196.46", - "65.21.196.47", - "65.21.196.48", + "65.21.196.45", # metal-01.he-eu-hel1.nimbus.pyrmont + "65.21.196.46", # metal-02.he-eu-hel1.nimbus.pyrmont ] }