From f933dd0df86ff30d1b714a468dc8f69ca3ec42f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Tue, 11 May 2021 11:59:34 +0200 Subject: [PATCH] rayonism: put Geth config in the same folder as Beacon node MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way we create both as part of the same Docker network. Signed-off-by: Jakub SokoĊ‚owski --- ansible/group_vars/nimbus.rayonism.yml | 6 +++++- ansible/requirements.yml | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/nimbus.rayonism.yml b/ansible/group_vars/nimbus.rayonism.yml index 609a166..f2272a6 100644 --- a/ansible/group_vars/nimbus.rayonism.yml +++ b/ansible/group_vars/nimbus.rayonism.yml @@ -1,6 +1,8 @@ --- # Geth node geth_service_name: 'nimbus-nocturne' +geth_service_path: '{{ beacon_node_cont_vol }}' +geth_compose_path: '{{ geth_service_path }}/docker-compose.geth.yml' geth_cont_image: 'ethereum/client-go@sha256:82920663d5c2378d9d21c640f30c885154e5eca6d1dd7ccec83711f527aeddbf' geth_account_pass: '{{lookup("passwordstore", "service/Nimbus-Geth/password")}}' geth_sync_mode: 'fast' @@ -24,8 +26,10 @@ geth_network_name: 'mainnet' # Beacon node beacon_node_network: 'nocturne' +beacon_node_cont_name: 'beacon-node-{{ beacon_node_network }}-{{ beacon_node_cont_tag }}' +beacon_node_cont_vol: '/docker/{{ beacon_node_cont_name }}' beacon_node_cont_tag: 'qmerge-large' -beacon_node_web3_urls: [ 'ws://{{ ansible_local.tinc.vpn_ip }}:{{ geth_websocket_port }}' ] +beacon_node_web3_urls: [ 'ws://geth:{{ geth_websocket_port }}' ] # Disabled for genesis to avoid missing first two slots beacon_node_doppelganger_detection: false diff --git a/ansible/requirements.yml b/ansible/requirements.yml index e19e8df..528bd04 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -36,7 +36,7 @@ - name: infra-role-beacon-node src: git@github.com:status-im/infra-role-beacon-node.git - version: 3f6ef254706bf9f90cc617c8fe7324765aacac5d + version: 37f8a3ab06cd08c9053b292f60e734962cab616d scm: git - name: kibana @@ -71,7 +71,7 @@ - name: infra-role-geth src: git@github.com:status-im/infra-role-geth.git - version: f76e6f37792dc39302d175017f79a4711ecf33df + version: 5ad36567e810fb74073d8fc82774146450e4761a scm: git - name: infra-role-geth-exporter