diff --git a/roles/workers/defaults/main.yaml b/roles/workers/defaults/main.yaml index f201b8b..6831edd 100644 --- a/roles/workers/defaults/main.yaml +++ b/roles/workers/defaults/main.yaml @@ -3,4 +3,13 @@ conductor_workers_server: http://conductor-dev.int.d4science.net/api conductor_workers: [ { service: 'base', image: 'nubisware/nubisware-conductor-worker-py-base', replicas: 2, threads: 1, pollrate: 1 }] +pymail_server: "smtp-relay.d4science.org" +pymail_user: "conductor_{{ infrastructure }}" +pymail_protocol: "starttls" +pymail_port: "587" + +#smtp_dev_pwd: in vault +#smtp_pre_pwd: in vault +#smtp_prod_pwd: in vault + #{service: 'provisioning', image: 'nubisware/nubisware-conductor-worker-py-provisioning', replicas: 2, threads: 1, pollrate: 1 } diff --git a/roles/workers/defaults/smtp.yaml b/roles/workers/defaults/smtp.yaml new file mode 100644 index 0000000..9dcdcb6 --- /dev/null +++ b/roles/workers/defaults/smtp.yaml @@ -0,0 +1,10 @@ +$ANSIBLE_VAULT;1.1;AES256 +62323839306636626530646263356365643863653430393837343037643461666230333037383239 +6266363838393538643739393765656165613161396236330a323834623936373933643335306163 +33323739663463326265613663363132383364336432646237666466663061393631623239306266 +6363396363326364310a376362313934653933613939313463653865363538363935333866366164 +36373062353631356632356230316535616666633265326136343061303962633163393264316431 +31623730623764363763633939373963333333343731376466613437386264653461616263306530 +63663032653030643239643830346631303766393136363337626635633664353635363161313562 +63623733613039646465386434396238336637626632616566323734303362653633373936393532 +3665 diff --git a/roles/workers/templates/config.cfg.j2 b/roles/workers/templates/config.cfg.j2 index 01e03af..21adc3a 100644 --- a/roles/workers/templates/config.cfg.j2 +++ b/roles/workers/templates/config.cfg.j2 @@ -7,3 +7,10 @@ pollrate = .1 domain={{ item.domain }} {% endif %} +[pymail] +server = {{ pymail_server}} +user = {{ pymail_user }} +password = {{ pymail_password }} +protocol = {{ pymail_protocol }} +port = {{ pymail_port }} + diff --git a/site-dev.yaml b/site-dev.yaml index 6390d32..64af8d6 100644 --- a/site-dev.yaml +++ b/site-dev.yaml @@ -1,8 +1,11 @@ --- - hosts: dev_infra + vars_files: + - roles/workers/defaults/smtp.yaml vars: cluster_check: true infrastructure: dev + pymail_password: "{{ smtp_dev_pwd }}" conductor_workers_server: http://conductor-server:8080/api roles: - common diff --git a/site-pre.yaml b/site-pre.yaml index b2a52bf..82c5b13 100644 --- a/site-pre.yaml +++ b/site-pre.yaml @@ -2,9 +2,11 @@ - hosts: pre_infra vars_files: - roles/external-postgres/defaults/vault_main.yaml + - roles/workers/defaults/smtp.yaml vars: cluster_check: true infrastructure: pre + pymail_password: "{{ smtp_pre_pwd }}" conductor_workers_server: http://conductor-server:8080/api roles: - common diff --git a/site-prod.yaml b/site-prod.yaml index 03633ae..68e7ef1 100644 --- a/site-prod.yaml +++ b/site-prod.yaml @@ -2,9 +2,11 @@ - hosts: prod_infra vars_files: - roles/external-postgres/defaults/vault_main.yaml + - roles/workers/defaults/smtp.yaml vars: cluster_check: true conductor_workers_server: http://conductor-server:8080/api + pymail_password: "{{ smtp_prod_pwd }}" postgres_jdbc_pass: '{{ jdbc_pass }}' roles: - common