From ac7696dae9606c75f652571b662ec0b33436b4d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 12 Sep 2022 15:50:43 +0200 Subject: [PATCH] configure secrets and validators paths explicitly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Necessary to later provide `/var/empty` as path for both in order to use validator client service instead of loading validators directly. https://github.com/status-im/infra-nimbus/issues/122 Signed-off-by: Jakub SokoĊ‚owski --- defaults/main.yml | 5 ++++- tasks/service.yml | 2 ++ tasks/validators.yml | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9edf532..679ea0f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,6 +5,8 @@ beacon_node_service_user_pass: '{{ ansible_date_time.epoch | password_hash("sha5 beacon_node_service_home: 'C:\Users\{{ beacon_node_service_user_name }}' beacon_node_service_path: '{{ beacon_node_service_home }}\{{ beacon_node_service_name }}' beacon_node_era_dir_path: '{{ beacon_node_data_path }}\era' +beacon_node_secrets_path: '{{ beacon_node_data_path }}\secrets' +beacon_node_validators_path: '{{ beacon_node_data_path }}\validators' beacon_node_service_logs_path: '{{ beacon_node_service_path }}\logs' beacon_node_service_bin_path: '{{ beacon_node_service_path }}\bin' beacon_node_service_exe: '{{ beacon_node_service_bin_path }}\nimbus_beacon_node.exe' @@ -42,7 +44,8 @@ beacon_node_valid_network_names: ["pyrmont", "prater", "mainnet", "steklo", "noc # Automatically distribute validators beacon_node_dist_validators_enabled: false beacon_node_dist_validators_name: '{{ beacon_node_network }}_deposits' -beacon_node_dist_validators_path: '{{ beacon_node_data_path }}' +beacon_node_dist_validators_sec_path: '{{ beacon_node_secrets_path }}' +beacon_node_dist_validators_val_path: '{{ beacon_node_validators_path }}' #beacon_node_dist_validators_start: ~ #beacon_node_dist_validators_end: ~ diff --git a/tasks/service.yml b/tasks/service.yml index cabd0fd..5c5871f 100644 --- a/tasks/service.yml +++ b/tasks/service.yml @@ -17,6 +17,8 @@ --non-interactive --network={{ beacon_node_network }} --data-dir="{{ beacon_node_data_path }}" + --secrets-dir="{{ beacon_node_secrets_path }}" + --validators-dir="{{ beacon_node_validators_path }}" --era-dir="{{ beacon_node_era_dir_path }}" {% for url in beacon_node_web3_urls | mandatory %} --web3-url="{{ url | mandatory }}" diff --git a/tasks/validators.yml b/tasks/validators.yml index 3335eef..d5c889b 100644 --- a/tasks/validators.yml +++ b/tasks/validators.yml @@ -2,12 +2,13 @@ - name: 'Distribute validators and secrets' include_role: name=infra-role-dist-validators vars: + dist_validators_name: '{{ beacon_node_dist_validators_name }}' dist_validators_user: '{{ beacon_node_service_user_name }}' dist_validators_user_pass: '{{ beacon_node_service_user_pass }}' - dist_validators_name: '{{ beacon_node_dist_validators_name }}' dist_validators_start: '{{ beacon_node_dist_validators_start | mandatory }}' dist_validators_end: '{{ beacon_node_dist_validators_end | mandatory }}' - dist_validators_path: '{{ beacon_node_dist_validators_path | mandatory }}' + dist_validators_sec_path: '{{ beacon_node_dist_validators_sec_path | mandatory }}' + dist_validators_val_path: '{{ beacon_node_dist_validators_val_path | mandatory }}' - when: dist_validators_deployed is defined block: