Merge pull request #1131 from mira-miracoli/roll-back-job-conf-native…

…-condor

remove condor-secondary from job conf

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"

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

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 %}