From c85d852e9ce616d16b74ce50fc7d260df95082fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Sat, 26 Mar 2022 10:36:56 +0100 Subject: [PATCH] drop config for nimbus.pyrmont fleet MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The testnet has been discontinued. Signed-off-by: Jakub SokoĊ‚owski --- README.md | 2 +- ansible/group_vars/nimbus-geth-goerli.yml | 1 - ansible/group_vars/nimbus-openeth-mainnet.yml | 2 - ansible/group_vars/nimbus.pyrmont.yml | 47 ------------------- .../metal-01.he-eu-hel1.nimbus.pyrmont.yml | 14 ------ ansible/inventory/test | 12 ----- ansible/pyrmont.yml | 26 ---------- ansible/rebuild.yml | 1 - ansible/requirements.yml | 10 ++-- ansible/restart.yml | 1 - .../roles/get-geth-api-urls/defaults/main.yml | 1 - outputs.tf | 1 - pyrmont.tf | 29 ------------ 13 files changed, 6 insertions(+), 141 deletions(-) delete mode 100644 ansible/group_vars/nimbus.pyrmont.yml delete mode 100644 ansible/host_vars/metal-01.he-eu-hel1.nimbus.pyrmont.yml delete mode 100644 ansible/pyrmont.yml delete mode 100644 pyrmont.tf diff --git a/README.md b/README.md index 49a8f3e..57191c9 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ There's a dedicated Kibana dashboard for Nimbus fleet logs: https://nimbus-logs. There are explorers available for various testnets: -* https://pyrmont.beaconcha.in/ * https://prater.beaconcha.in/ +* https://beaconchain.kiln.themerge.dev/ # Details diff --git a/ansible/group_vars/nimbus-geth-goerli.yml b/ansible/group_vars/nimbus-geth-goerli.yml index f497aa2..87202c8 100644 --- a/ansible/group_vars/nimbus-geth-goerli.yml +++ b/ansible/group_vars/nimbus-geth-goerli.yml @@ -34,7 +34,6 @@ open_ports_default_comment: 'Geth API' open_ports_default_chain: 'VPN' open_ports_list: - { port: '{{ geth_expo_cont_port }}', ipset: 'metrics.hq', comment: 'Geth Metrics' } - - { port: '{{ geth_websocket_port }}', ipset: 'nimbus.pyrmont' } - { port: '{{ geth_websocket_port }}', ipset: 'nimbus.prater' } - { port: '{{ geth_websocket_port }}', ipset: 'nimbus.eth1' } - { port: '{{ geth_rpc_port }}' , ipset: 'nimbus.eth1' } diff --git a/ansible/group_vars/nimbus-openeth-mainnet.yml b/ansible/group_vars/nimbus-openeth-mainnet.yml index 11d5403..d89d0ba 100644 --- a/ansible/group_vars/nimbus-openeth-mainnet.yml +++ b/ansible/group_vars/nimbus-openeth-mainnet.yml @@ -27,11 +27,9 @@ open_ports_default_chain: 'VPN' open_ports_list: - { port: '{{ openethereum_p2p_port }}', chain: 'SERVICES' } - { port: '{{ openethereum_metrics_port }}', ipset: 'metrics.hq' } - - { port: '{{ openethereum_rpc_port }}', ipset: 'nimbus.pyrmont' } - { port: '{{ openethereum_rpc_port }}', ipset: 'nimbus.prater' } - { port: '{{ openethereum_rpc_port }}', ipset: 'nimbus.eth1' } - { port: '{{ openethereum_rpc_port }}', ipset: 'rocket.prod' } - - { port: '{{ openethereum_websocket_port }}', ipset: 'nimbus.pyrmont' } - { port: '{{ openethereum_websocket_port }}', ipset: 'nimbus.prater' } - { port: '{{ openethereum_websocket_port }}', ipset: 'nimbus.eth1' } - { port: '{{ openethereum_websocket_port }}', ipset: 'rocket.prod' } diff --git a/ansible/group_vars/nimbus.pyrmont.yml b/ansible/group_vars/nimbus.pyrmont.yml deleted file mode 100644 index 60b7f80..0000000 --- a/ansible/group_vars/nimbus.pyrmont.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -beacon_node_network: 'pyrmont' -beacon_node_repo_branch: '{{ node.branch is search("libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch) }}' -# TODO Simplify this, maybe change branch name. -beacon_node_log_level: 'INFO' -beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}' -# Ports -beacon_node_discovery_port: '{{ 9000 + port_offset }}' -beacon_node_listening_port: '{{ 9000 + port_offset }}' -beacon_node_metrics_port: '{{ 9200 + port_offset }}' -beacon_node_rest_port: '{{ 9300 + port_offset }}' -# Tuning -beacon_node_max_peers: 250 -beacon_node_threads: '{{ (node.branch == "testing") | ternary(4, 1) }}' -# Monitoring -beacon_node_validator_monitor_auto: '{{ node.branch == "unstable" }}' -beacon_node_validator_monitor_totals: >- - {{ node.branch == "unstable" and - ((node.public_api is defined and node.public_api) - or - (node.end is defined and (node.end - node.start) > 64)) }} -# Builds -beacon_node_build_frequency: '{{ node.build_frequency }}' -# Validators from nimbus-private repo -beacon_node_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}' -beacon_node_dist_validators_start: '{{ node.start | mandatory }}' -beacon_node_dist_validators_end: '{{ node.end | mandatory }}' -# HTTP RPC support is unstable -beacon_node_web3_urls: '{{ beacon_node_web3_urls_all | reject("match", "^http://") }}' -# Light client data -beacon_node_light_client_data_enabled: '{{ node.branch in ["unstable", "libp2p"] }}' -# Other -beacon_node_proposer_boosting_debug: '{{ node.branch == "unstable" }}' - -# Split by hostname and branch for more central location. -nodes_layout: - 'metal-01.he-eu-hel1.nimbus.pyrmont': # 4000 validators each - - { branch: 'stable', start: 0, end: 4000, build_frequency: '*-*-* 11:00:00' } - - { 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': # 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/host_vars/metal-01.he-eu-hel1.nimbus.pyrmont.yml b/ansible/host_vars/metal-01.he-eu-hel1.nimbus.pyrmont.yml deleted file mode 100644 index 69c1da2..0000000 --- a/ansible/host_vars/metal-01.he-eu-hel1.nimbus.pyrmont.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -# Communityu test REST API endpoint. -beacon_node_rest_address: '0.0.0.0' - -# WARNING: This will change if number of nodes changes. -redirect_ports: - # beacon-node-pyrmont-unstable-01 - - { src: 80, dst: 9301, comment: 'Test Beacon API (80->9301/tcp)' } - -# Open Ports -open_ports_default_comment: 'Test Beacon API' -open_ports_list: - - { port: 80 } - diff --git a/ansible/inventory/test b/ansible/inventory/test index 0ea16ab..8cc19ff 100644 --- a/ansible/inventory/test +++ b/ansible/inventory/test @@ -10,11 +10,9 @@ metal-01.he-eu-hel1.nimbus.fluffy hostname=metal-01.he-eu-hel1.nimbus.fluffy ans 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 metal-02.he-eu-hel1.nimbus.fluffy hostname=metal-02.he-eu-hel1.nimbus.fluffy ansible_host=65.108.42.174 env=nimbus stage=fluffy data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-02.he-eu-hel1.nimbus.fluffy.statusim.net metal-02.he-eu-hel1.nimbus.mainnet hostname=metal-02.he-eu-hel1.nimbus.mainnet ansible_host=135.181.0.33 env=nimbus stage=mainnet data_center=he-eu-hel1 region=eu-hel1 dns_entry=metal-02.he-eu-hel1.nimbus.mainnet.statusim.net 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.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 @@ -54,11 +52,9 @@ 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 metal-02.he-eu-hel1.nimbus.fluffy 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.prater metal-04.he-eu-hel1.nimbus.mainnet @@ -137,10 +133,6 @@ unstable-large-01.aws-eu-central-1a.nimbus.prater [nimbus-prater-windows] windows-01.he-eu-hel1.nimbus.prater -[nimbus-pyrmont-metal] -metal-01.he-eu-hel1.nimbus.pyrmont -metal-02.he-eu-hel1.nimbus.pyrmont - [nimbus.eth1] metal-01.he-eu-hel1.nimbus.eth1 @@ -181,7 +173,3 @@ testing-large-01.aws-eu-central-1a.nimbus.prater unstable-large-01.aws-eu-central-1a.nimbus.prater windows-01.he-eu-hel1.nimbus.prater -[nimbus.pyrmont] -metal-01.he-eu-hel1.nimbus.pyrmont -metal-02.he-eu-hel1.nimbus.pyrmont - diff --git a/ansible/pyrmont.yml b/ansible/pyrmont.yml deleted file mode 100644 index 7b3beb3..0000000 --- a/ansible/pyrmont.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- name: Verify Ansible versions - hosts: all - tags: always - become: false - run_once: true - gather_facts: false - tasks: - - local_action: command ./versioncheck.py - changed_when: false - -- name: Deploy pyrmont Metal beacon nodes - become: true - serial: '{{ serial|default(4) }}' - hosts: - - nimbus-pyrmont-metal - roles: - - { role: redirect-ports, tags: redirect-ports } - - { role: get-geth-api-urls, tags: get-geth-api-urls } - tasks: - - include_role: name=infra-role-beacon-node-linux - tags: [ beacon-node, infra-role-beacon-node-linux ] - with_items: '{{ nodes_layout[hostname] }}' - loop_control: - loop_var: node - index_var: port_offset diff --git a/ansible/rebuild.yml b/ansible/rebuild.yml index aa44ad4..57ef53e 100644 --- a/ansible/rebuild.yml +++ b/ansible/rebuild.yml @@ -2,7 +2,6 @@ - name: Start rebuilds of all nodes hosts: - nimbus.mainnet - - nimbus.pyrmont - nimbus.prater become: false tasks: diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 058cb72..b55ef09 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -36,12 +36,12 @@ - name: oauth-proxy src: git@github.com:status-im/infra-role-oauth-proxy.git - version: 4dd42c56a40b0fe002ccc810fe48b982de805d27 + version: b551ae21261775bd68ba59af0ccb8b11dcef962e scm: git - name: consul-service src: git@github.com:status-im/infra-role-consul-service.git - version: 7ee51839e6a032e6ca27dfb00951e897b5385609 + version: 2b3d4e53856d6cc91ae5c5a342fd12f2bb96aa88 scm: git - name: infra-role-beacon-node-linux @@ -51,7 +51,7 @@ - name: infra-role-beacon-node-windows src: git@github.com:status-im/infra-role-beacon-node-windows.git - version: eb51f129e13509517207f9763c3522ed5fcba7be + version: 8599494a48d0b1f7c3da0d338088e7c895737b80 scm: git - name: infra-role-beacon-node-macos @@ -86,12 +86,12 @@ - name: kibana src: git@github.com:status-im/infra-role-kibana.git - version: c996858afae7effa7984403917827e79c732b957 + version: 7ea3e3b48bde0c582abdba59e3e0e418a3d2d89d scm: git - name: elasticsearch src: git@github.com:status-im/infra-role-elasticsearch.git - version: 18503666d0ec23b0f03328575531cd8ce8dce9db + version: d759410f171fb742c63163f8f3095a8a2d97f5ed scm: git - name: elasticsearch-lb diff --git a/ansible/restart.yml b/ansible/restart.yml index 1a1d8df..738e671 100644 --- a/ansible/restart.yml +++ b/ansible/restart.yml @@ -2,7 +2,6 @@ - name: Restart all nodes on all hosts hosts: - nimbus.mainnet - - nimbus.pyrmont - nimbus.prater become: false tasks: diff --git a/ansible/roles/get-geth-api-urls/defaults/main.yml b/ansible/roles/get-geth-api-urls/defaults/main.yml index 09211e5..9b79ef7 100644 --- a/ansible/roles/get-geth-api-urls/defaults/main.yml +++ b/ansible/roles/get-geth-api-urls/defaults/main.yml @@ -1,6 +1,5 @@ --- eth2_to_eth1_map: - pyrmont: 'goerli' prater: 'goerli' mainnet: 'mainnet' diff --git a/outputs.tf b/outputs.tf index 445c9ab..b8397cf 100644 --- a/outputs.tf +++ b/outputs.tf @@ -6,7 +6,6 @@ output "hosts" { module.nimbus_geth_mainnet.hosts, module.nimbus_nodes_mainnet_hetzner.hosts, module.nimbus_nodes_mainnet_stable_small.hosts, - module.nimbus_nodes_pyrmont_hetzner.hosts, module.nimbus_nodes_prater_stable_large.hosts, module.nimbus_nodes_prater_testing_large.hosts, module.nimbus_nodes_prater_unstable_large.hosts, diff --git a/pyrmont.tf b/pyrmont.tf deleted file mode 100644 index 177d926..0000000 --- a/pyrmont.tf +++ /dev/null @@ -1,29 +0,0 @@ -/* Hetzner AX41-NVMe - * AMD Ryzen 5 3600 Hexa-Core - * 64 GB DDR4 RAM - * 2 x 512 GB NVMe SSD */ -module "nimbus_nodes_pyrmont_hetzner" { - source = "./modules/dummy-module" - - name = "metal" - env = "nimbus" - stage = "pyrmont" - group = "nimbus-pyrmont-metal" - region = "eu-hel1" - prefix = "he" - domain = var.domain - - ips = [ - "65.21.196.45", # metal-01.he-eu-hel1.nimbus.pyrmont - "65.21.196.46", # metal-02.he-eu-hel1.nimbus.pyrmont - ] -} - -/* Community test REST API endpoints. */ -resource "cloudflare_record" "unstable_pyrmont_beacon_api" { - zone_id = local.zones["nimbus.team"] - name = "insecura" - value = module.nimbus_nodes_pyrmont_hetzner.public_ips[0] - type = "A" - proxied = false -}