From d8fdd846360a6dd63123c618821de9072234131d Mon Sep 17 00:00:00 2001
From: Mira Kuntz <mira.kuntz@yahoo.com>
Date: Wed, 13 Mar 2024 14:57:04 +0100
Subject: [PATCH 1/2] remove condor-secondary from job conf

---
 group_vars/sn06.yml                              | 2 --
 templates/galaxy/config/job_conf.yml             | 9 ---------
 templates/galaxy/config/pulsar_app_secondary.yml | 9 ---------
 3 files changed, 20 deletions(-)
 delete mode 100644 templates/galaxy/config/pulsar_app_secondary.yml

diff --git a/group_vars/sn06.yml b/group_vars/sn06.yml
index 538a8a7a5..9ec200c39 100644
--- a/group_vars/sn06.yml
+++ b/group_vars/sn06.yml
@@ -455,8 +455,6 @@ galaxy_config_templates:
     dest: "{{ galaxy_config_dir }}/grt.yml"
   - src: "{{ galaxy_config_template_src_dir }}/config/pulsar_app.yml"
     dest: "{{ galaxy_config_dir }}/pulsar_app.yml"
-  - src: "{{ galaxy_config_template_src_dir }}/config/pulsar_app_secondary.yml"
-    dest: "{{ galaxy_config_dir }}/pulsar_app_secondary.yml"
   - src: "{{ galaxy_config_template_src_dir }}/config/tool_conf.xml.j2"
     dest: "{{ galaxy_config_dir }}/tool_conf.xml"
   - src: "{{ galaxy_config_template_src_dir }}/config/galaxy_workflow_scheduler.j2"
diff --git a/templates/galaxy/config/job_conf.yml b/templates/galaxy/config/job_conf.yml
index 448a3b123..037f95d6b 100644
--- a/templates/galaxy/config/job_conf.yml
+++ b/templates/galaxy/config/job_conf.yml
@@ -15,20 +15,11 @@ galaxy_jobconf:
     #workers: 3
     - id: condor
       load: galaxy.jobs.runners.condor:CondorJobRunner
-    - id: condor_secondary
-      load: galaxy.jobs.runners.condor:CondorJobRunner
-      params:
-        condor_rm_cmd: "sudo {{ nspawn_condor_rm_command }}"
-        condor_ssh_to_job_cmd: "sudo {{ nspawn_condor_ssh_to_job_command }}"
-        condor_submit_cmd: "sudo {{ nspawn_condor_submit_command }}"
     - id: local
       load: galaxy.jobs.runners.local:LocalJobRunner
     - id: pulsar_embedded
       load: galaxy.jobs.runners.pulsar:PulsarEmbeddedJobRunner
       pulsar_config: "{{ galaxy_config_dir }}/pulsar_app.yml"
-    - id: pulsar_embedded_secondary
-      load: galaxy.jobs.runners.pulsar:PulsarEmbeddedJobRunner
-      pulsar_config: "{{ galaxy_config_dir }}/pulsar_app_secondary.yml"
 
     - id: pulsar_eu_it01
       load: galaxy.jobs.runners.pulsar:PulsarMQJobRunner
diff --git a/templates/galaxy/config/pulsar_app_secondary.yml b/templates/galaxy/config/pulsar_app_secondary.yml
deleted file mode 100644
index ba7cc4099..000000000
--- a/templates/galaxy/config/pulsar_app_secondary.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-private_token: {{ pulsar_private_token }}
-staging_directory: /data/jwd01/pulsar_staging/
-tool_dependency_dir: /data/dnb01/galaxy_db/pulsar_dependencies/
-
-managers:
-  _default_:
-    type: queued_condor
-    condor_rm_cmd: "sudo {{ nspawn_condor_rm_command }}"
-    condor_submit_cmd: "sudo {{ nspawn_condor_submit_command }}"

From 604cf8842a97889f4cea0a2578393500dd1747d4 Mon Sep 17 00:00:00 2001
From: Mira Kuntz <mira.kuntz@yahoo.com>
Date: Wed, 13 Mar 2024 15:05:25 +0100
Subject: [PATCH 2/2] remove secondary condor from template

---
 templates/galaxy/config/job_conf.yml.j2 | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/templates/galaxy/config/job_conf.yml.j2 b/templates/galaxy/config/job_conf.yml.j2
index a6a48df0d..52ad02a9b 100644
--- a/templates/galaxy/config/job_conf.yml.j2
+++ b/templates/galaxy/config/job_conf.yml.j2
@@ -136,17 +136,3 @@ limits:
     window: {{ limit['window'] }}
 {% endif %}
 {% endfor %}
-{# Replicate destination limits for the secondary HTCondor cluster #}
-{% for limit in galaxy_jobconf['limits'] | sort(attribute='type') %}
-{% if limit['type'].startswith('destination_') and 'id' in limit
-and (limit['id'].startswith('condor_') or limit['id'].startswith('interactive_pulsar')) %}
-  - type: {{ limit['type'] }}
-    value: {{ limit['value'] }}
-    id: secondary_{{ limit['id'] }}
-{% if 'tag' in limit %}
-    tag: {{ limit['tag'] }}
-{% elif 'window' in limit %}
-    window: {{ limit['window'] }}
-{% endif %}
-{% endif %}
-{% endfor %}