From dd43e135a5f1a36e8c8423412536d138e4e94fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 10 Mar 2022 12:27:14 +0100 Subject: [PATCH] move metal-07.he-eu-hel1.nimbus.prater to nimbus.kiln MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also move validators from it to `metal-06`. https://github.com/status-im/infra-nimbus/issues/88 Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.prater.yml | 20 +++++++------------- ansible/inventory/test | 12 ++++++++---- ansible/requirements.yml | 4 ++-- kiln.tf | 15 +++++++++++++++ prater.tf | 1 - 5 files changed, 32 insertions(+), 20 deletions(-) create mode 100644 kiln.tf diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index ab7a8e8..1289014 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -94,18 +94,12 @@ nodes_layout: 'metal-05.he-eu-hel1.nimbus.prater': # 60 each - { branch: 'stable', start: 20164, end: 20224, build_freq: '*-*-* 11:00:00' } - - { branch: 'testing', start: 20284, end: 20344, build_freq: '*-*-* 15:00:00' } - - { branch: 'unstable', start: 20224, end: 20284, build_freq: '*-*-* 13:00:00' } + - { branch: 'testing', start: 20284, end: 20344, build_freq: '*-*-* 15:00:00', num_threads: 0, branch_override: 'nim-1.6', nim_commit: 'version-1-6' } + - { branch: 'unstable', start: 20224, end: 20284, build_freq: '*-*-* 13:00:00', open_libp2p_ports: false } - { branch: 'libp2p', start: 20344, end: 20404, build_freq: '*-*-* 17:00:00' } - 'metal-06.he-eu-hel1.nimbus.prater': # 899 each - - { branch: 'stable', start: 20404, end: 22303, build_freq: '*-*-* 11:00:00' } - - { branch: 'testing', start: 24202, end: 26101, build_freq: '*-*-* 15:00:00', open_libp2p_ports: false, branch_override: 'nim-1.6', nim_commit: 'version-1-6' } - - { branch: 'unstable', start: 22303, end: 24202, build_freq: '*-*-* 13:00:00' } - - { branch: 'libp2p', start: 26101, end: 28000, build_freq: '*-*-* 17:00:00' } - - 'metal-07.he-eu-hel1.nimbus.prater': # 4000 each - - { branch: 'stable', start: 28000, end: 31000, build_freq: '*-*-* 11:00:00' } - - { branch: 'testing', start: 34000, end: 37000, build_freq: '*-*-* 15:00:00', num_threads: 0, branch_override: 'nim-1.6', nim_commit: 'version-1-6' } - - { branch: 'unstable', start: 31000, end: 34000, build_freq: '*-*-* 13:00:00', open_libp2p_ports: false } - - { branch: 'libp2p', start: 37000, end: 40000, build_freq: '*-*-* 17:00:00' } + 'metal-06.he-eu-hel1.nimbus.prater': # 4899 each + - { branch: 'stable', start: 20404, end: 25303, build_freq: '*-*-* 11:00:00' } + - { branch: 'testing', start: 25303, end: 30202, build_freq: '*-*-* 15:00:00', open_libp2p_ports: false, branch_override: 'nim-1.6', nim_commit: 'version-1-6' } + - { branch: 'unstable', start: 30202, end: 35101, build_freq: '*-*-* 13:00:00' } + - { branch: 'libp2p', start: 35101, end: 40000, build_freq: '*-*-* 17:00:00' } diff --git a/ansible/inventory/test b/ansible/inventory/test index 0fb5f24..0ea16ab 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -7,6 +7,7 @@ mainnet-01.aws-eu-central-1a.nimbus.geth hostname=mainnet-01.aws-eu-central-1a.n mainnet-01.he-eu-hel1.nimbus.openeth hostname=mainnet-01.he-eu-hel1.nimbus.openeth ansible_host=95.217.120.250 env=nimbus stage=openeth data_center=he-eu-hel1 region=eu-hel1 dns_entry=mainnet-01.he-eu-hel1.nimbus.openeth.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.kiln hostname=metal-01.he-eu-hel1.nimbus.kiln ansible_host=65.21.89.157 env=nimbus stage=kiln data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-01.he-eu-hel1.nimbus.kiln.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.prater hostname=metal-01.he-eu-hel1.nimbus.prater ansible_host=65.21.73.183 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-01.he-eu-hel1.nimbus.prater.statusim.net metal-01.he-eu-hel1.nimbus.pyrmont hostname=metal-01.he-eu-hel1.nimbus.pyrmont ansible_host=65.21.196.45 env=nimbus stage=pyrmont data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-01.he-eu-hel1.nimbus.pyrmont.statusim.net @@ -22,7 +23,6 @@ metal-05.he-eu-hel1.nimbus.mainnet hostname=metal-05.he-eu-hel1.nimbus.mainnet a metal-05.he-eu-hel1.nimbus.prater hostname=metal-05.he-eu-hel1.nimbus.prater ansible_host=65.21.92.118 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-05.he-eu-hel1.nimbus.prater.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-06.he-eu-hel1.nimbus.prater hostname=metal-06.he-eu-hel1.nimbus.prater ansible_host=65.21.91.59 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-06.he-eu-hel1.nimbus.prater.statusim.net -metal-07.he-eu-hel1.nimbus.prater hostname=metal-07.he-eu-hel1.nimbus.prater ansible_host=65.21.89.157 env=nimbus stage=prater data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-07.he-eu-hel1.nimbus.prater.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 @@ -51,6 +51,7 @@ node-01.aws-eu-central-1a.dash.nimbus mainnet-01.he-eu-hel1.nimbus.openeth metal-01.he-eu-hel1.nimbus.eth1 metal-01.he-eu-hel1.nimbus.fluffy +metal-01.he-eu-hel1.nimbus.kiln metal-01.he-eu-hel1.nimbus.mainnet metal-01.he-eu-hel1.nimbus.prater metal-01.he-eu-hel1.nimbus.pyrmont @@ -66,7 +67,6 @@ metal-05.he-eu-hel1.nimbus.mainnet metal-05.he-eu-hel1.nimbus.prater metal-06.he-eu-hel1.nimbus.mainnet metal-06.he-eu-hel1.nimbus.prater -metal-07.he-eu-hel1.nimbus.prater store-01.he-eu-hel1.logs.nimbus store-02.he-eu-hel1.logs.nimbus store-03.he-eu-hel1.logs.nimbus @@ -96,6 +96,9 @@ goerli-01.aws-eu-central-1a.nimbus.geth [nimbus-geth-mainnet] mainnet-01.aws-eu-central-1a.nimbus.geth +[nimbus-kiln-metal] +metal-01.he-eu-hel1.nimbus.kiln + [nimbus-mainnet-metal] metal-01.he-eu-hel1.nimbus.mainnet metal-02.he-eu-hel1.nimbus.mainnet @@ -121,7 +124,6 @@ metal-03.he-eu-hel1.nimbus.prater metal-04.he-eu-hel1.nimbus.prater metal-05.he-eu-hel1.nimbus.prater metal-06.he-eu-hel1.nimbus.prater -metal-07.he-eu-hel1.nimbus.prater [nimbus-prater-stable] stable-large-01.aws-eu-central-1a.nimbus.prater @@ -150,6 +152,9 @@ metal-02.he-eu-hel1.nimbus.fluffy goerli-01.aws-eu-central-1a.nimbus.geth mainnet-01.aws-eu-central-1a.nimbus.geth +[nimbus.kiln] +metal-01.he-eu-hel1.nimbus.kiln + [nimbus.mainnet] metal-01.he-eu-hel1.nimbus.mainnet metal-02.he-eu-hel1.nimbus.mainnet @@ -171,7 +176,6 @@ metal-03.he-eu-hel1.nimbus.prater metal-04.he-eu-hel1.nimbus.prater metal-05.he-eu-hel1.nimbus.prater metal-06.he-eu-hel1.nimbus.prater -metal-07.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 diff --git a/ansible/requirements.yml b/ansible/requirements.yml index bd4da9b..a165da3 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -31,7 +31,7 @@ - name: infra-role-wireguard src: git@github.com:status-im/infra-role-wireguard.git - version: 6cc6472e32b6dc53d7d854ab5a34d554451bec15 + version: b711bbabd2dc3d9ce8b1c3a6e5bc785901db9d09 scm: git - name: oauth-proxy @@ -96,7 +96,7 @@ - name: systemd-timer src: git@github.com:status-im/infra-role-systemd-timer.git - version: 827033833eaf994d3b6f6ac1b555b90fdf1dd467 + version: 49c37e1df8feb4d7938b3cc2ffc59f6dfed10231 scm: git - name: swap-file diff --git a/kiln.tf b/kiln.tf new file mode 100644 index 0000000..6ef9e92 --- /dev/null +++ b/kiln.tf @@ -0,0 +1,15 @@ +module "nimbus_nodes_kiln_hetzner" { + source = "./modules/dummy-module" + + name = "metal" + env = "nimbus" + stage = "kiln" + group = "nimbus-kiln-metal" + region = "eu-hel1" + prefix = "he" + domain = var.domain + + ips = [ + "65.21.89.157", # metal-01.he-eu-hel1.nimbus.kiln + ] +} diff --git a/prater.tf b/prater.tf index 73d0944..e97ad0c 100644 --- a/prater.tf +++ b/prater.tf @@ -127,7 +127,6 @@ module "nimbus_nodes_prater_hetzner" { "65.21.196.48", # metal-04.he-eu-hel1.nimbus.prater "65.21.92.118", # metal-05.he-eu-hel1.nimbus.prater "65.21.91.59", # metal-06.he-eu-hel1.nimbus.prater - "65.21.89.157", # metal-07.he-eu-hel1.nimbus.prater ] }