Use default job file

README.md

@@ -51,7 +51,7 @@ The variables that can be passed to this role and a brief description about them
 	# ENV variables for the Docker Galaxy in case of using slurm
 	slurm_galaxy_docker_env_vars:
 	   NONUSE: slurmctld,reports
-	   GALAXY_CONFIG_JOB_CONFIG_FILE: "/export/slurm_job_conf.xml"
+	   GALAXY_DESTINATIONS_DEFAULT: "slurm_cluster_docker"
 
 	galaxy_docker_volumes:
 	  - "/var/run/docker.sock:/var/run/docker.sock"

defaults/main.yml

@@ -36,14 +36,12 @@ galaxy_docker_env_vars:
    GALAXY_DEFAULT_ADMIN_KEY: "{{galaxy_admin_password}}"
    GALAXY_CONFIG_ADMIN_USERS: "{{galaxy_admin}}"
    GALAXY_CONFIG_MASTER_API_KEY: "{{galaxy_admin_api_key}}"
-   GALAXY_CONFIG_JOB_CONFIG_FILE: "/export/local_job_conf.xml"
    GALAXY_DESTINATIONS_DEFAULT: "local_no_container"
    GALAXY_RUNNERS_ENABLE_SLURM: "False"
 
 # ENV variables for the Docker Galaxy in case of using slurm
 slurm_galaxy_docker_env_vars:
    NONUSE: "reports,slurmctld,slurmd,nodejs,condor"
-   GALAXY_CONFIG_JOB_CONFIG_FILE: "/export/slurm_job_conf.xml"
    GALAXY_DESTINATIONS_DEFAULT: "slurm_cluster"
 
 galaxy_docker_volumes:

tasks/portal.yml

@@ -18,11 +18,6 @@
 - include_tasks: slurm.yml
   when: galaxy_lrms == "slurm"
 
-- name: Copy local_job_conf.xml
-  copy:
-    src: local_job_conf.xml
-    dest: "{{galaxy_export_dir}}/local_job_conf.xml"
-
 - name: Start galaxy container
   docker_container:
     name: galaxy

tasks/slurm.yml

@@ -30,12 +30,6 @@
 - name: Generate slurm.conf in the export dir
   template: src=slurm.conf.j2 dest={{galaxy_export_dir}}/slurm.conf
 
-# Configure job_conf.xml
-- name: Configure job_conf.xml
-  copy:
-    src: slurm_job_conf.xml
-    dest: "{{galaxy_export_dir}}/slurm_job_conf.xml"
-
 - name: Install dev libs in RHEL
   yum: name=python3-devel,bzip2-devel,xz-devel
   when: ansible_os_family == "RedHat"