diff --git a/files/galaxy/config/user_preferences_extra_conf.yml b/files/galaxy/config/user_preferences_extra_conf.yml index 3ebbe1fec..d9bb911dc 100644 --- a/files/galaxy/config/user_preferences_extra_conf.yml +++ b/files/galaxy/config/user_preferences_extra_conf.yml @@ -73,6 +73,7 @@ preferences: - ["Prague (Czech Republic) - MetaCentrum", cz-pulsar] - ["Bratislava (Slovakia) - IISAS", sk-pulsar] - ["Bari (Italy) - INFN", egi-pulsar] + - ["Barcelona (Spain) - BSC-CNS", bsc-pulsar] ega_account: description: Your EGA (European Genome Archive) account diff --git a/files/galaxy/tpv/destinations.yml.j2 b/files/galaxy/tpv/destinations.yml.j2 index e0f347169..457c02a26 100644 --- a/files/galaxy/tpv/destinations.yml.j2 +++ b/files/galaxy/tpv/destinations.yml.j2 @@ -302,6 +302,16 @@ destinations: require: - egi-pulsar + pulsar_bsc01_tpv: + inherits: pulsar_default + runner: pulsar_eu_bsc01 + max_accepted_cores: 16 + max_accepted_mem: 64 + min_accepted_gpus: 0 + max_accepted_gpus: 0 + scheduling: + require: + - bsc-pulsar ############################# # LOCAL CONDOR DESTINATIONS # diff --git a/group_vars/mq.yml b/group_vars/mq.yml index b455fa79e..64f09ea0a 100644 --- a/group_vars/mq.yml +++ b/group_vars/mq.yml @@ -108,6 +108,9 @@ rabbitmq_users: - user: galaxy_egi01 password: "{{ rabbitmq_password_galaxy_egi01 }}" vhost: /pulsar/galaxy_egi01 + - user: galaxy_bsc01 + password: "{{ rabbitmq_password_galaxy_bsc01 }}" + vhost: /pulsar/galaxy_bsc01 rabbitmq_plugins: - rabbitmq_management diff --git a/templates/galaxy/config/job_conf.yml b/templates/galaxy/config/job_conf.yml index 25d009146..045f5729c 100644 --- a/templates/galaxy/config/job_conf.yml +++ b/templates/galaxy/config/job_conf.yml @@ -197,6 +197,17 @@ galaxy_jobconf: amqp_consumer_timeout: 2.0 amqp_publish_retry: "true" amqp_publish_retry_max_retries: 60 + - id: pulsar_eu_bsc01 + load: galaxy.jobs.runners.pulsar:PulsarMQJobRunner + params: + amqp_url: "pyamqp://galaxy_bsc01:{{ rabbitmq_password_galaxy_bsc01 }}@mq.galaxyproject.eu:5671//pulsar/galaxy_bsc01?ssl=1" + galaxy_url: "https://usegalaxy.eu" + manager: production + amqp_acknowledge: "true" + amqp_ack_republish_time: 300 + amqp_consumer_timeout: 2.0 + amqp_publish_retry: "true" + amqp_publish_retry_max_retries: 60 default_destination: tpv_dispatcher destinations: - id: local