From dbce2ffc5dc7adb1670849e5d418b11f7a3fd0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 29 Mar 2021 13:27:00 +0200 Subject: [PATCH] deploiy new Docker Compose setup for Geth nodes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus-geth-goerli.yml | 10 ++++------ ansible/group_vars/nimbus-geth-mainnet.yml | 12 +++++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ansible/group_vars/nimbus-geth-goerli.yml b/ansible/group_vars/nimbus-geth-goerli.yml index fd20a95..dea5d49 100644 --- a/ansible/group_vars/nimbus-geth-goerli.yml +++ b/ansible/group_vars/nimbus-geth-goerli.yml @@ -5,9 +5,8 @@ swap_file_size_mb: 4096 # Geth node +geth_service_name: 'nimbus-goerli' geth_network_name: 'goerli' -geth_cont_name: 'geth-{{ geth_network_name }}' -geth_extra_alias: '{{ geth_cont_name }}' geth_sync_mode: 'full' geth_log_level_name: info geth_websocket_enabled: true @@ -15,15 +14,14 @@ geth_websocket_enabled: true geth_account_pass: '{{lookup("passwordstore", "service/Nimbus-Geth/password")}}' # Allow connections from our Tinc VPN geth_websocket_origins: '*' - # Memory settings geth_cont_mem_ratio: 0.7 geth_cache_size: '{{ (ansible_memtotal_mb * 0.25|float) | int }}' # Geth metrics -geth_source_cont_name: '{{ geth_cont_name }}' -geth_expo_cont_name: '{{ geth_cont_name }}-metrics' -geth_expo_consul_id: '{{ geth_expo_cont_name }}' +geth_expo_service_name: '{{ geth_service_name }}' +geth_expo_source_cont_name: '{{ geth_cont_name }}' +geth_expo_source_data_path: '{{ geth_cont_vol }}/data' # Ports geth_port: 30303 diff --git a/ansible/group_vars/nimbus-geth-mainnet.yml b/ansible/group_vars/nimbus-geth-mainnet.yml index 33abdcb..8200b2b 100644 --- a/ansible/group_vars/nimbus-geth-mainnet.yml +++ b/ansible/group_vars/nimbus-geth-mainnet.yml @@ -1,13 +1,12 @@ --- -# This node is used as replacement for Infura for end-to-end tests. +# This will be is used instead of Infura for Eth2 Mainnet Nimbus nodes. # Syncing can use a lot of mamory swap_file_size_mb: 4096 # Geth node +geth_service_name: 'nimbus-mainnet' geth_network_name: 'mainnet' -geth_cont_name: 'geth-{{ geth_network_name }}' -geth_extra_alias: '{{ geth_cont_name }}' geth_sync_mode: 'fast' geth_log_level_name: info geth_websocket_enabled: true @@ -15,14 +14,13 @@ geth_websocket_enabled: true geth_account_pass: '{{lookup("passwordstore", "service/Nimbus-Geth/password")}}' # Allow connections from our Tinc VPN geth_websocket_origins: '*' - # Memory settings geth_cont_mem_ratio: 0.7 # Geth metrics -geth_source_cont_name: '{{ geth_cont_name }}' -geth_expo_cont_name: '{{ geth_cont_name }}-metrics' -geth_expo_consul_id: '{{ geth_expo_cont_name }}' +geth_expo_service_name: '{{ geth_service_name }}' +geth_expo_source_cont_name: '{{ geth_cont_name }}' +geth_expo_source_data_path: '{{ geth_cont_vol }}/data' # Ports geth_port: 30303