From 7a239812ecda5c399048d890acc53e360d3113d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 2 Jan 2024 13:20:49 +0100 Subject: [PATCH] nimbus.prater: remove Erigon node to save disk space MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was using 1.1 TB on `linux-05`, which is unreasonable. And the network is deprecated anyway. Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.prater.yml | 23 ----------------------- ansible/prater.yml | 6 ------ ansible/vars/layout/prater.yml | 2 +- 3 files changed, 1 insertion(+), 30 deletions(-) diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 7fa3bb6..a5c34c8 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -41,27 +41,6 @@ nethermind_rpc_port: '{{ 8645 + (idx|int) + 11 }}' nethermind_authrpc_port: '{{ 8651 + (idx|int) + 11 }}' nethermind_metrics_port: '{{ 6660 + (idx|int) + 11 }}' -# Erigon node -erigon_network_name: 'goerli' -erigon_service_name: 'erigon-{{ erigon_network_name }}-{{ "%02d"|format(idx|int+1) }}' -erigon_prune: 'hrtc' # TODO: Possibly wrong, verify. -erigon_log_level: 'info' -erigon_cont_mem_ratio: 0.15 -erigon_max_peers: 20 -erigon_miner_enabled: true -erigon_mining_private_key: '{{lookup("bitwarden", "nimbus/wallet/testnets", field="private-key")}}' -erigon_discovery_dns_entries: ['enrtree://AKA3AM6LPBYEUDMVNU3BSVQJ5AD45Y7YPOHJLEF6W26QOE4VTUDPE@all.goerli.ethdisco.net'] -# Ports -erigon_metrics_enabled: true -erigon_rpc_addr: '0.0.0.0' -erigon_authrpc_addr: '0.0.0.0' -erigon_port: '{{ 40303 + (idx|int) + 21 }}' -erigon_p2p_allowed_ports: ['{{ erigon_port }}', '{{ erigon_port|int + 1 }}'] -erigon_metrics_port: '{{ 7060 + (idx|int) + 21 }}' -erigon_rpc_port: '{{ 9545 + (idx|int) + 21 }}' -erigon_authrpc_port: '{{ 9551 + (idx|int) + 21 }}' -erigon_authrpc_jwtsecret: '{{lookup("bitwarden", "nimbus/jwt-token")}}' - # Nimbus Beacon node beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}' beacon_node_network: 'prater' @@ -120,7 +99,6 @@ beacon_node_light_client_data_import_mode: 'full' # Execution layer Enginer API beacon_node_exec_layer_urls: >- {{ [ "http://localhost:"+geth_authrpc_port ] + - ([ "http://localhost:"+erigon_authrpc_port ] if node.get("erigon", False) else []) + ([ "http://localhost:"+nethermind_authrpc_port ] if node.get("nethermind", False) else []) }} beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}' @@ -173,7 +151,6 @@ open_ports_default_chain: 'VPN' open_ports_list: - { port: '9300:9310', ipset: '{{ env }}.{{ stage }}' } - { port: '9400:9500', ipset: 'metrics.hq', comment: 'Geth Exporter' } - - { port: '7060:7160', ipset: 'metrics.hq', comment: 'Erigon Metrics' } - { port: '6660:6760', ipset: 'metrics.hq', comment: 'Nethermind Metrics' } - { port: '9546:9550', ipset: 'wakuv2.test', comment: 'Wakuv2 Websocket' } - { port: '40303:40403', chain: 'SERVICES', comment: 'Nethermind', protocol: 'tcp' } diff --git a/ansible/prater.yml b/ansible/prater.yml index 76dce14..d5076f0 100644 --- a/ansible/prater.yml +++ b/ansible/prater.yml @@ -42,12 +42,6 @@ - { role: redirect-ports, tags: [ redirect-ports ] } - { role: nimbus-era-files, tags: [ nimbus-era-files ] } tasks: - - include_role: name=infra-role-erigon - with_items: '{{ nodes_layout[hostname] }}' - when: node.get('erigon', false) - loop_control: - loop_var: node - index_var: idx - include_role: name=infra-role-nethermind with_items: '{{ nodes_layout[hostname] }}' when: node.get('nethermind', false) diff --git a/ansible/vars/layout/prater.yml b/ansible/vars/layout/prater.yml index 82e0252..970afc9 100644 --- a/ansible/vars/layout/prater.yml +++ b/ansible/vars/layout/prater.yml @@ -55,7 +55,7 @@ nodes_layout: 'linux-05.ih-eu-mda1.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', open_libp2p_ports: false, erigon: true } + - { 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' } 'linux-06.ih-eu-mda1.nimbus.prater':