Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run usegalaxy-eu.htcondor_release and usegalaxy-eu.fix-stop-ITs on HTCondor nodes (secondary cluster) playing the submit role #1009

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions group_vars/htcondor-secondary-submit-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ nspawn_config: |
{% for mount in jwd.values() if mount.name != "birna01" %}
Bind={{ mount.path }}
{% endfor %}
Bind=/data/dnb01/maintenance
Bind={{ galaxy_log_dir }}
BindReadOnly={{ galaxy_config_dir }}

[Exec]
NotifyReady=yes
Expand Down
15 changes: 15 additions & 0 deletions group_vars/htcondor-submit.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# Configure HTCondor submit nodes.
---
htcondor_role_submit: true

postgres_user: galaxy
postgres_host: sn05.galaxyproject.eu
postgres_port: 5432

galaxy_root: /opt/galaxy
galaxy_venv_dir: "{{ galaxy_root }}/venv"
galaxy_server_dir: "{{ galaxy_root }}/server"
galaxy_config_dir: "{{ galaxy_root }}/config"
galaxy_config_file: "{{ galaxy_config_dir }}/galaxy.yml"
galaxy_mutable_config_dir: "{{ galaxy_root }}/mutable-config"
galaxy_log_dir: "/var/log/galaxy"
galaxy_config:
galaxy:
job_working_directory: /data/jwd04/main
85 changes: 85 additions & 0 deletions htcondor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,49 @@
ansible.builtin.service:
name: condor
state: reloaded
vars_files:
- secret_group_vars/db-main.yml # PostgreSQL password (galaxyproject.gxadmin)
pre_tasks:
- name: Ensure findutils is installed.
become: true
ansible.builtin.package:
name: findutils
state: installed

- name: Ensure gxadmin dependencies are installed. (galaxyproject.gxadmin)
become: true
ansible.builtin.package:
name:
- git
- make
- postgresql
state: installed
when: htcondor_role_submit

- name: Ensure galaxy_jwd script dependencies are installed. (usegalaxy-eu.bashrc)
become: true
ansible.builtin.package:
name:
- python3-psycopg2
- python3-pyyaml
state: installed
when: htcondor_role_submit

- name: Ensure cron is installed.
become: true
ansible.builtin.package:
name:
- crontabs
- cronie-anacron
when: htcondor_role_submit

- name: Ensure crond is enabled and started.
ansible.builtin.service:
name: crond
enabled: true
state: started
when: htcondor_role_submit

- name: Ensure the HTCondor configuration directory exists.
become: true
ansible.builtin.file:
Expand Down Expand Up @@ -250,4 +286,53 @@
register: service_facts
roles:
- usegalaxy_eu.handy.os_setup
- name: usegalaxy-eu.bashrc
when: htcondor_role_submit
- name: hxr.postgres-connection
when: htcondor_role_submit
- name: galaxyproject.gxadmin
when: htcondor_role_submit
- grycap.htcondor
- name: usegalaxy-eu.htcondor_release
when: htcondor_role_submit
- name: usegalaxy-eu.fix-stop-ITs
when: htcondor_role_submit
post_tasks:
- name: Add /usr/local/bin to Galaxy's PATH in bashrc file. (usegalaxy-eu.fix-stop-ITs)
when: htcondor_role_submit
lineinfile:
path: "{{ galaxy_user.home }}/.bashrc"
line: 'export PATH="/usr/local/bin:$PATH"'

- name: Issue HTCondor token for the Galaxy user. (usegalaxy-eu.fix-stop-ITs)
become: true
when: htcondor_role_submit
block:
- name: Ensure tokens directory exists.
ansible.builtin.file:
path: "{{ galaxy_user.home }}/.condor/tokens.d"
state: directory
owner: "{{ galaxy_user.name }}"
group: "{{ galaxy_group.name }}"
mode: "0700"

- name: Check if token already exists.
ansible.builtin.stat:
path: "{{ galaxy_user.home }}/.condor/tokens.d/{{ galaxy_user.name }}@{{ htcondor_server }}"
register: htcondor_token

- name: Issue token.
when: not htcondor_token.stat.exists
ansible.builtin.shell:
executable: /bin/bash
cmd: 'condor_token_create -identity {{ galaxy_user.name }}@{{ htcondor_server }}
> "{{ galaxy_user.home }}/.condor/tokens.d/{{ galaxy_user.name }}@{{ htcondor_server }}"'
creates: "{{ galaxy_user.home }}/.condor/tokens.d/{{ galaxy_user.name }}@{{ htcondor_server }}"

- name: Configure token permissions.
when: not htcondor_token.stat.exists
ansible.builtin.file:
path: "{{ galaxy_user.home }}/.condor/tokens.d/{{ galaxy_user.name }}@{{ htcondor_server }}"
owner: "{{ galaxy_user.name }}"
group: "{{ galaxy_group.name }}"
mode: "0400"