diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml index 33a4bf4..f732357 100644 --- a/ansible/group_vars/nimbus.prater.yml +++ b/ansible/group_vars/nimbus.prater.yml @@ -1,7 +1,5 @@ --- # Not pretty but avoids useless files -node_size: |- - {{ (hostname is search("large")) | ternary("large", "small") }} node_branch: |- {{ (hostname is search("unstable")) | ternary("unstable", ( (hostname is search("testing")) | ternary("testing", ( @@ -11,12 +9,21 @@ node_branch: |- )))))))) }} # TEMPORARY switch for Prater Altair transition -beacon_node_cont_image: 'statusteam/nimbus_beacon_node:unstable-{{ node_size }}' -beacon_node_cont_tag: '{{ node_branch }}-{{ node_size }}' +beacon_node_repo_branch: 'unstable' # '{{ node_branch }}' beacon_node_network: 'prater' +beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node_branch }}' -# Peers +# Ports +beacon_node_discovery_port: 9000 +beacon_node_listening_port: 9000 +beacon_node_metrics_port: 9200 +beacon_node_rest_port: 9300 +beacon_node_rpc_port: 9900 +beacon_node_rpc_enabled: true + +# Tuning beacon_node_max_peers: 300 +beacon_node_threads: '{{ (beacon_node_repo_branch == "testing") | ternary(4, 1) }}' # Windows service user beacon_node_service_user_pass: '{{lookup("bitwarden", "nimbus/windows", field="password")}}' diff --git a/ansible/prater.yml b/ansible/prater.yml index bddd542..f4541b1 100644 --- a/ansible/prater.yml +++ b/ansible/prater.yml @@ -22,7 +22,7 @@ roles: - role: get-geth-web3-urls tags: get-geth-web3-urls - - role: infra-role-beacon-node-docker + - role: infra-role-beacon-node-linux tags: beacon-node - name: Deploy mainnet linux beacon nodes @@ -93,6 +93,7 @@ vars: beacon_node_repo_branch: '{{ node.branch }}' beacon_node_build_frequency: '{{ node.build_frequency }}' + beacon_node_build_start_time: '{{ node.build_start }}' beacon_node_discovery_port: '{{ 9000 + port_offset }}' beacon_node_listening_port: '{{ 9000 + port_offset }}' beacon_node_metrics_port: '{{ 9200 + port_offset }}' @@ -101,9 +102,9 @@ beacon_node_dist_validators_start: '{{ node.start }}' beacon_node_dist_validators_end: '{{ node.end }}' with_items: - - { branch: 'stable', start: 0, end: 0, beacon_node_build_start_time: {'hour': '12', 'minute': '00'} } - - { branch: 'testing', start: 0, end: 0, beacon_node_build_start_time: {'hour': '14', 'minute': '00'} } - - { branch: 'unstable', start: 0, end: 0, beacon_node_build_start_time: {'hour': '16', 'minute': '00'} } + - { branch: 'stable', start: 0, end: 0, build_start: {'hour': '12', 'minute': '00'} } + - { branch: 'testing', start: 0, end: 0, build_start: {'hour': '14', 'minute': '00'} } + - { branch: 'unstable', start: 0, end: 0, build_start: {'hour': '16', 'minute': '00'} } loop_control: loop_var: node index_var: port_offset diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 1a8dc09..50d63a6 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -41,17 +41,17 @@ - name: infra-role-beacon-node-linux src: git@github.com:status-im/infra-role-beacon-node-linux.git - version: 75e8e7199302e8980da8870e056b9eefebd7edde + version: c8125f1a289acc78067642d4732f119995eccde6 scm: git - name: infra-role-beacon-node-windows src: git@github.com:status-im/infra-role-beacon-node-windows.git - version: 6a60f7e41263ba147e403833d752bae047b8ad38 + version: 4e0ef739b0cdcca6ab902701b999149fe787ac5b scm: git - name: infra-role-beacon-node-macos src: git@github.com:status-im/infra-role-beacon-node-macos.git - version: 4852faf929f3f6f27d611a43bf4e75a49aabf28c + version: 32bb0097ed4db170aee39e139fd7d2c3ee440b0f scm: git - name: infra-role-dist-validators