diff --git a/ansible/host_vars/metal-01.he-eu-hel1.nimbus.mainnet.yml b/ansible/host_vars/metal-01.he-eu-hel1.nimbus.mainnet.yml index c728ec2..d50a8d5 100644 --- a/ansible/host_vars/metal-01.he-eu-hel1.nimbus.mainnet.yml +++ b/ansible/host_vars/metal-01.he-eu-hel1.nimbus.mainnet.yml @@ -4,4 +4,5 @@ beacon_node_rest_address: '0.0.0.0' # WARNING: This will change if number of nodes changes. redirect_ports: + # beacon-node-mainnet-unstable-01 - { src: 80, dst: 9304, comment: 'Test Beacon API (80->9304/tcp)' } diff --git a/ansible/host_vars/metal-01.he-eu-hel1.nimbus.prater.yml b/ansible/host_vars/metal-01.he-eu-hel1.nimbus.prater.yml new file mode 100644 index 0000000..7c273b3 --- /dev/null +++ b/ansible/host_vars/metal-01.he-eu-hel1.nimbus.prater.yml @@ -0,0 +1,8 @@ +--- +# 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-prater-unstable-02 + - { src: 80, dst: 9305, comment: 'Test Beacon API (80->9304/tcp)' } diff --git a/ansible/host_vars/metal-02.he-eu-hel1.nimbus.mainnet.yml b/ansible/host_vars/metal-02.he-eu-hel1.nimbus.mainnet.yml index f32d2c7..492857f 100644 --- a/ansible/host_vars/metal-02.he-eu-hel1.nimbus.mainnet.yml +++ b/ansible/host_vars/metal-02.he-eu-hel1.nimbus.mainnet.yml @@ -4,4 +4,5 @@ beacon_node_rest_address: '0.0.0.0' # WARNING: This will change if number of nodes changes. redirect_ports: + # beacon-node-mainnet-testing-01 - { src: 80, dst: 9302, comment: 'Test Beacon API (80->9302/tcp)' } diff --git a/ansible/prater.yml b/ansible/prater.yml index c2eb7fd..beef68b 100644 --- a/ansible/prater.yml +++ b/ansible/prater.yml @@ -29,28 +29,33 @@ become: true hosts: nimbus-prater-metal roles: + - { role: redirect-ports, tags: [ redirect-ports ] } - { role: get-geth-web3-urls, tags: [ get-geth-web3-urls ] } tasks: - include_role: name=infra-role-beacon-node-linux tags: beacon-node vars: # TEMPORARY switch for Prater Altair transition - beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}' + beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}-{{ "%02d"|format(node.idx) }}' beacon_node_repo_branch: "unstable" beacon_node_threads: '{{ (node.branch == "testing") | ternary(4, 1) }}' - beacon_node_build_frequency: '{{ node.build_frequency }}' + beacon_node_build_frequency: '{{ node.build_freq }}' 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 }}' - beacon_node_rpc_enabled: true beacon_node_rpc_port: '{{ 9900 + port_offset }}' + beacon_node_rpc_enabled: true + beacon_node_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}' beacon_node_dist_validators_start: '{{ node.start }}' beacon_node_dist_validators_end: '{{ node.end }}' with_items: - - { branch: 'stable', start: 10000, end: 12500, build_frequency: '*-*-* 12:00:00' } - - { branch: 'testing', start: 22500, end: 25000, build_frequency: '*-*-* 16:00:00' } - - { branch: 'unstable', start: 35000, end: 37500, build_frequency: '*-*-* 14:00:00' } + - { branch: 'stable', idx: 1, start: 10000, end: 12500, build_freq: '*-*-* 12:00:00' } + - { branch: 'stable', idx: 2, build_freq: '*-*-* 13:00:00' } + - { branch: 'testing', idx: 1, start: 22500, end: 25000, build_freq: '*-*-* 14:00:00' } + - { branch: 'testing', idx: 2, build_freq: '*-*-* 15:00:00' } + - { branch: 'unstable', idx: 1, start: 35000, end: 37500, build_freq: '*-*-* 16:00:00' } + - { branch: 'unstable', idx: 2, build_freq: '*-*-* 17:00:00' } loop_control: loop_var: node index_var: port_offset diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 7aacbb7..fb94434 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -46,7 +46,7 @@ - name: infra-role-beacon-node-linux src: git@github.com:status-im/infra-role-beacon-node-linux.git - version: c8125f1a289acc78067642d4732f119995eccde6 + version: 8e08632b1d854e0318fffcc4a47e95ef3cd656b6 scm: git - name: infra-role-beacon-node-windows diff --git a/prater.tf b/prater.tf index 4110e4e..2915f91 100644 --- a/prater.tf +++ b/prater.tf @@ -185,6 +185,15 @@ module "nimbus_nodes_prater_hetzner" { ips = ["65.21.73.183"] } +/* Community test REST API endpoint. */ +resource "cloudflare_record" "unstable_prater_beacon_api" { + zone_id = local.zones["nimbus.team"] + name = "unstable.prater.beacon-api" + value = module.nimbus_nodes_prater_hetzner.public_ips[0] + type = "A" + proxied = false +} + module "nimbus_nodes_prater_macos" { source = "./modules/dummy-module"