From c995c180177874a45cf1d9a07c82b27dbe04aaf9 Mon Sep 17 00:00:00 2001 From: leonidastri Date: Thu, 19 Dec 2024 09:26:23 +0100 Subject: [PATCH] refactor: change paths --- roles/yoda_report/defaults/main.yml | 3 ++- roles/yoda_report/tasks/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/yoda_report/defaults/main.yml b/roles/yoda_report/defaults/main.yml index ed3a95b6b..074e66998 100644 --- a/roles/yoda_report/defaults/main.yml +++ b/roles/yoda_report/defaults/main.yml @@ -20,5 +20,6 @@ yoda_report_upload_priv_key: | yoda_report_server_user_account: yoda_report yoda_report_server_host: 192.168.121.245 -yoda_report_server_dir: /home/yoda_report/yoda-financial-data +yoda_report_server_financial_data_dir: /home/yoda_report/yoda-financial-data +yoda_report_server_capacity_data_dir: /home/yoda_report/yoda-capacity-data yoda_report_server_priv_key_loc: ~/.ssh/yoda_report diff --git a/roles/yoda_report/tasks/main.yml b/roles/yoda_report/tasks/main.yml index 06d3908fe..dab0b908a 100644 --- a/roles/yoda_report/tasks/main.yml +++ b/roles/yoda_report/tasks/main.yml @@ -105,7 +105,7 @@ source /var/yoda-financial-data/yoda_report_venv/bin/activate && scp -i {{ yoda_report_server_priv_key_loc }} /var/yoda-financial-data/stats.yaml - {{ yoda_report_server_user_account }}@{{ yoda_report_server_host }}:{{ yoda_report_server_dir }}/{{ instance }}.stats.yml + {{ yoda_report_server_user_account }}@{{ yoda_report_server_host }}:{{ yoda_report_server_financial_data_dir }}/{{ instance }}.stats.yml user: "{{ irods_service_account }}" state: "{{ 'present' if enable_yoda_report else 'absent' }}" @@ -131,6 +131,6 @@ source /var/yoda-financial-data/yoda_report_venv/bin/activate && scp -i {{ yoda_report_server_priv_key_loc }} /var/yoda-financial-data/*.capacity.yaml - {{ yoda_report_server_user_account }}@{{ yoda_report_server_host }}:{{ yoda_report_server_dir }}/{{ instance }}.capacity.stats.yml + {{ yoda_report_server_user_account }}@{{ yoda_report_server_host }}:{{ yoda_report_server_capacity_data_dir }}/{{ instance }}.capacity.stats.yml user: "{{ irods_service_account }}" state: "{{ 'present' if enable_yoda_report else 'absent' }}"