Skip to content

Commit ae253d6

Browse files
committed
enable onedata templates on GCZ and qa1
1 parent ee03c61 commit ae253d6

File tree

6 files changed

+13
-1
lines changed

6 files changed

+13
-1
lines changed

galaxy.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,13 @@
225225
state: restarted
226226
name: nginx
227227

228+
# not detected automatically due to a bug: https://github.com/galaxyproject/galaxy/issues/20483
229+
- name: Install conditional dependencies
230+
pip:
231+
name: fs.onedatarestfs==21.2.5.2
232+
virtualenv: "{{ galaxy_venv_dir }}"
233+
when: "inventory_hostname in ['galaxy-qa1.galaxy.cloud.e-infra.cz','usegalaxy.cz']"
234+
228235
- name: Creates entry in crontab "chmod on _files for ngnix access"
229236
ansible.builtin.cron:
230237
name: "chmod on _files for ngnix access"

group_vars/galaxyservers.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ galaxy_config:
155155
edam_panel_views: "{{ csnt_edam_panel_views }}"
156156
default_panel_view: "{{ csnt_default_panel_view }}"
157157
panel_views_dir: "{{ galaxy_config_dir }}/plugins/activities"
158+
file_source_templates_config_file: "{{ galaxy_config_dir }}/file_source_templates.yml"
158159
# NFS workarounds
159160
retry_job_output_collection: 3
160161
# Debugging
@@ -258,6 +259,8 @@ galaxy_config_templates:
258259
dest: "{{ tpv_mutable_dir }}/tpv_rules_meta.yml"
259260
- src: "templates/galaxy/config/vault_conf.yml.j2"
260261
dest: "{{ galaxy_config_dir }}/vault_conf.yml"
262+
- src: "{{ lookup('first_found', ['templates/'+inventory_hostname+'/config/file_source_templates.yml.j2', 'templates/galaxy/config/file_source_templates.yml.j2']) }}"
263+
dest: "{{ galaxy_config_dir }}/file_source_templates.yml"
261264

262265
galaxy_extra_dirs:
263266
- "{{ tpv_config_dir }}"

host_vars/usegalaxy.cz/vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rbd_mount_point: /rbd
77
galaxy_mutable_data_dir: "{{ rbd_mount_point }}/data"
88

99
galaxy_commit_id: release_25.0
10-
# galaxy_build_client: false
10+
galaxy_build_client: false
1111

1212
csnt_log_level: DEBUG
1313
csnt_enable_notification_system: true
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- include: "{{ galaxy_server_dir }}/lib/galaxy/files/templates/examples/onedata.yml"

templates/galaxy/config/file_source_templates.yml.j2

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- include: "{{ galaxy_server_dir }}/lib/galaxy/files/templates/examples/onedata.yml"

0 commit comments

Comments
 (0)