Merge pull request #165 from johanherman/separate-ua-address

Mail for Uppsala projects should go to an other address
NationalGenomicsInfrastructure · Nov 25, 2016 · a4acf4c · a4acf4c
2 parents 2ea97de + 24b00f2
commit a4acf4c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/host_vars/127.0.0.1/main.yml b/host_vars/127.0.0.1/main.yml
@@ -46,7 +46,8 @@ ngi_rnaseq_dest: "{{ root_path }}/sw/ngi-rnaseq"
 
 gatk_key: pontus.larsson_medsci.uu.se.key
 
-recipient_mail: [email protected]
+recipient_mail_sthlm: [email protected]
+recipient_mail_upps: [email protected] 
 
 validation_data_root: "/lupus/ngi/validation_data/"
 validation_data: 

diff --git a/roles/ngi_pipeline/tasks/main.yml b/roles/ngi_pipeline/tasks/main.yml
@@ -58,6 +58,7 @@
     ngi_pipeline_db: "{{ ngi_pipeline_db_upps }}"
     ngi_pipeline_slurm_project: "{{ ngi_pipeline_upps_delivery }}"
     ngi_pipeline_log: "{{ ngi_pipeline_log_upps }}"
+    recipient_mail: "{{ recipient_mail_upps }}"
 
 - name: Deploy irma ngi_pipeline config for uppsala 
   template: src="irma_ngi_config.yaml.j2" dest="{{ ngi_pipeline_conf }}/{{ upps_config }}"
@@ -67,6 +68,7 @@
     ngi_pipeline_db: "{{ ngi_pipeline_db_sthlm }}"
     ngi_pipeline_slurm_project: "{{ ngi_pipeline_sthlm_delivery }}"
     ngi_pipeline_log: "{{ ngi_pipeline_log_sthlm }}"
+    recipient_mail: "{{ recipient_mail_sthlm }}"
 
 - name: Deploy irma ngi_pipeline config for stockholm
   template: src="irma_ngi_config.yaml.j2" dest="{{ ngi_pipeline_conf }}/{{ sthlm_config }}"

diff --git a/roles/nougat/templates/NouGAT_config.conf.j2 b/roles/nougat/templates/NouGAT_config.conf.j2
@@ -3,7 +3,7 @@ qc_analysis:
   time: 1-00:00:00
   project: {{ ngi_pipeline_sthlm_delivery }}
   threads: 16
-  email: {{ recipient_mail }}
+  email: {{ recipient_mail_sthlm }}
   env: {{ NGI_venv_name }}
   qos: normal
 qc_report:
@@ -14,14 +14,14 @@ assembly:
   time: 1-00:00:00
   project: {{ ngi_pipeline_sthlm_delivery }}
   threads: 16
-  email: {{ recipient_mail }}
+  email: {{ recipient_mail_sthlm }}
   env: {{ NGI_venv_name }}
   qos: normal
 validation:
   global_config: {{ nougat_dest }}/config_files/config_de_novo_irma.yaml
   time: 1-00:00:00
   project: {{ ngi_pipeline_sthlm_delivery }}
   threads: 16
-  email: {{ recipient_mail }}
+  email: {{ recipient_mail_sthlm }}
   env: {{ NGI_venv_name }}
   qos: normal
diff --git a/roles/taca/tasks/main.yml b/roles/taca/tasks/main.yml
@@ -23,6 +23,7 @@
     ngi_pipeline_site_path: "{{ ngi_pipeline_upps_path }}"
     ngi_site_softlinks: "{{ ngi_upps_softlinks }}"
     ngi_pipeline_site_delivery: "{{ ngi_pipeline_upps_delivery }}"
+    recipient_mail: "{{ recipient_mail_upps }}"
 
 - name: Deploy standard uppsala configs
   template: src="site_taca_delivery.yml.j2" dest="{{ ngi_pipeline_conf }}/TACA/{{ site }}_{{ item.name }}_delivery.yml"
@@ -36,6 +37,7 @@
     ngi_pipeline_site_path: "{{ ngi_pipeline_sthlm_path }}"
     ngi_site_softlinks: "{{ ngi_sthlm_softlinks }}"
     ngi_pipeline_site_delivery: "{{ ngi_pipeline_sthlm_delivery }}"
+    recipient_mail: "{{ recipient_mail_sthlm }}"
 
 - name: Deploy sthlm_taca_local.yml config
   template: src="site_taca_local.yml.j2" dest="{{ ngi_pipeline_conf }}/TACA/{{ site }}_taca_local.yml"