diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml index 0fa2d6d..814c2ab 100644 --- a/ansible/group_vars/nimbus.mainnet.yml +++ b/ansible/group_vars/nimbus.mainnet.yml @@ -15,7 +15,7 @@ geth_cont_vol: '{{ geth_service_path }}/node' geth_sync_mode: 'snap' geth_log_level_name: 'info' geth_account_pass: '{{lookup("bitwarden", "nimbus/geth", field="password")}}' -geth_authrpc_jwtsecret: '{{lookup("bitwarden", "nimbus/jwt-token")}}' +geth_authrpc_jwtsecret: '{{ beacon_node_exec_layer_jwt_secret }}' # Memory settingsĀ¬ geth_cont_mem_ratio: 0.15 geth_cache_size: '{{ (ansible_memtotal_mb * 0.05|float) | int }}' @@ -76,9 +76,15 @@ beacon_node_light_client_data_enabled: '{{ (node.public_api is defined and node. beacon_node_light_client_data_serve: true beacon_node_light_client_data_import_mode: 'full' # Execution layer Enginer API -beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}' +beacon_node_exec_layer_jwt_secret: '{{lookup("bitwarden", "nimbus/jwt-token")}}' beacon_node_exec_layer_urls_local_geth: ['http://localhost:{{ geth_authrpc_port|string }}'] -beacon_node_exec_layer_urls_all: '{{ beacon_node_exec_layer_urls_discovered_geth + beacon_node_exec_layer_urls_local_geth }}' +beacon_node_exec_layer_urls_local_nimbus_eth1: ['http://localhost:{{ nimbus_eth1_engine_http_port|string }}'] +beacon_node_exec_layer_urls_all: >- + {{ + beacon_node_exec_layer_urls_discovered_geth + + beacon_node_exec_layer_urls_local_geth + + beacon_node_exec_layer_urls_local_nimbus_eth1 + }} beacon_node_exec_layer_urls: |- {{ beacon_node_exec_layer_urls_all if inventory_hostname_short == "linux-01" else (idx % 2 == 0) | ternary(beacon_node_exec_layer_urls_all, []) }} @@ -108,6 +114,25 @@ nimbus_era_files_network: '{{ beacon_node_network }}' nimbus_era_files_db_path: '/data/beacon-node-{{ beacon_node_network }}-stable-01/data/db' nimbus_era_files_nclidb_path: '/data/beacon-node-{{ beacon_node_network }}-stable-01/repo/build/ncli_db' +# Nimbus Eth1 node +nimbus_eth1_repo_branch: 'master' +nimbus_eth1_network: 'mainnet' +nimbus_eth1_max_peers: 160 +nimbus_eth1_log_level: 'DEBUG' +nimbus_eth1_service_path: '/docker/{{ nimbus_eth1_service_name }}' +nimbus_eth1_engine_http_enabled: true +nimbus_eth1_engine_ws_enabled: true +nimbus_eth1_era_dir: '{{ nimbus_era_files_timer_path }}' +nimbus_eth1_era1_dir: '/docker/era1' +# Ports +nimbus_eth1_listening_port: '{{ geth_port + 1 }}' +nimbus_eth1_discovery_port: '{{ geth_port + 1 }}' +nimbus_eth1_http_port: '{{ geth_rpc_port + 1 }}' +nimbus_eth1_metrics_port: '{{ geth_expo_cont_port + 1 }}' +nimbus_eth1_metrics_address: '0.0.0.0' +# API secert +nimbus_eth1_jwt_secret: '{{ beacon_node_exec_layer_jwt_secret }}' + # Open Ports open_ports_default_comment: 'Nimbus REST API' open_ports_default_chain: 'VPN' diff --git a/ansible/mainnet.yml b/ansible/mainnet.yml index 0a5cdf4..8f7efec 100644 --- a/ansible/mainnet.yml +++ b/ansible/mainnet.yml @@ -49,6 +49,7 @@ - { role: infra-role-geth-exporter, tags: [ infra-role-geth-exporter ] } - { role: get-geth-api-urls, tags: [ get-geth-api-urls, beacon-node ] } - { role: nimbus-era-files, tags: [ nimbus-era-files ] } + - { role: infra-role-nimbus-eth1, tags: [ nimbus-eth1 ] } tasks: - include_role: name: infra-role-beacon-node-linux diff --git a/ansible/requirements.yml b/ansible/requirements.yml index a59b678..5597536 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -50,7 +50,7 @@ - name: infra-role-nimbus-eth1 src: git@github.com:status-im/infra-role-nimbus-eth1.git - version: a9e82b5193d4930962f6a62e79d3b431a4030823 + version: cd87a47daea4b4751588f32eb1d1b964baa1776c - name: infra-role-nimbus-fluffy src: git@github.com:status-im/infra-role-nimbus-fluffy.git