Merge pull request #1518 from antoviaque/notifier-env-extra

notifier-env-extra: Allow to add extra variables to notifier environment

playbooks/roles/notifier/defaults/main.yml

@@ -19,6 +19,8 @@ NOTIFIER_DIGEST_EMAIL_TITLE: "Discussion Digest"
 NOTIFIER_DIGEST_EMAIL_DESCRIPTION: "A digest of unread content from course discussions you are following."
 NOTIFIER_EMAIL_SENDER_POSTAL_ADDRESS: ""
 
+NOTIFIER_ENV_EXTRA: {}
+
 NOTIFIER_LANGUAGE: ""
 
 NOTIFIER_ENV: "Development"

playbooks/roles/notifier/templates/edx/app/supervisor/conf.d/notifier-celery-workers.conf.j2

@@ -26,6 +26,7 @@ stderr_logfile_maxbytes=1MB
 stderr_logfile_backups=10
 stderr_capture_maxbytes=1MB
 environment=PID='/var/tmp/notifier-celery-workers.pid',LANG=en_US.UTF-8,
+{% do notifier_env_vars.update(NOTIFIER_ENV_EXTRA) %}
 {%- for name,value in notifier_env_vars.items() -%}
 {%- if value -%}{{name}}="{{value}}"{%- if not loop.last -%},{%- endif -%}{%- endif -%}
 {%- endfor -%}

playbooks/roles/notifier/templates/edx/app/supervisor/conf.d/notifier-scheduler.conf.j2

@@ -26,6 +26,7 @@ stderr_logfile_maxbytes=1MB
 stderr_logfile_backups=10
 stderr_capture_maxbytes=1MB
 environment=PID='/var/tmp/notifier-scheduler.pid',LANG=en_US.UTF-8,
+{% do notifier_env_vars.update(NOTIFIER_ENV_EXTRA) %}
 {%- for name,value in notifier_env_vars.items() -%}
 {%- if value -%}{{name}}="{{value}}"{%- if not loop.last -%},{%- endif -%}{%- endif -%}
 {%- endfor -%}

playbooks/roles/notifier/templates/notifier_env.j2

 # {{ ansible_managed }}
 
+{% do notifier_env_vars.update(NOTIFIER_ENV_EXTRA) %}
 {% for name,value in notifier_env_vars.items() %}
 {% if value %}
 export {{ name }}="{{ value }}"