opendev/system-config
Code Issues Proposed changes

OpenStackId: Update Email configuration

Browse Source 
This change is related to https://review.openstack.org/#/c/292605/
its sets smtp configuration and email log error capabilities to both nodes
production/dev.

Change-Id: Ie4ae1379451059b525a07611867dd4d3f6d6a9ac
This commit is contained in:
Sebastian Marcet 2016-03-16 08:22:04 -03:00
parent f73fc067cb
commit cfa22b1234
3 changed files with 121 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/site.pp
View File

@ -943,6 +943,12 @@ node 'openstackid.org' {
id_recaptcha_private_key => hiera('openstackid_recaptcha_private_key'),
app_url => 'https://openstackid.org',
app_key => hiera('openstackid_app_key'),
id_log_error_to_email => 'openstack@tipit.net',
id_log_error_from_email => 'noreply@openstack.org',
email_driver => 'smtp',
email_smtp_server => 'smtp.sendgrid.net',
email_smtp_server_user => hiera('openstackid_smtp_user'),
email_smtp_server_password => hiera('openstackid_smtp_password'),
}
}
@ -967,6 +973,12 @@ node 'openstackid-dev.openstack.org' {
id_recaptcha_private_key => hiera('openstackid_dev_recaptcha_private_key'),
app_url => 'https://openstackid-dev.openstack.org',
app_key => hiera('openstackid_dev_app_key'),
id_log_error_to_email => 'openstack@tipit.net',
id_log_error_from_email => 'noreply@openstack.org',
email_driver => 'smtp',
email_smtp_server => 'smtp.sendgrid.net',
email_smtp_server_user => hiera('openstackid_dev_smtp_user'),
email_smtp_server_password => hiera('openstackid_dev_smtp_password'),
}
}

10
modules/openstack_project/manifests/openstackid_dev.pp
View File

@ -41,6 +41,11 @@ class openstack_project::openstackid_dev (
$ssl_chain_file_contents = '',
$app_url = '',
$app_key = '',
$email_driver = 'mail',
$email_smtp_server = 'smtp.mailgun.org',
$email_smtp_server_port = 587,
$email_smtp_server_user = '',
$email_smtp_server_password = '',
) {
realize (
@ -80,6 +85,11 @@ class openstack_project::openstackid_dev (
ssl_chain_file_contents => $ssl_chain_file_contents,
app_url => $app_url,
app_key => $app_key,
email_driver => $email_driver,
email_smtp_server => $email_smtp_server,
email_smtp_server_port => $email_smtp_server_port,
email_smtp_server_user => $email_smtp_server_user,
email_smtp_server_password => $email_smtp_server_password,
}
# redis (custom module written by tipit)

10
modules/openstack_project/manifests/openstackid_prod.pp
View File

@ -42,6 +42,11 @@ class openstack_project::openstackid_prod (
$release = '1.0.13',
$app_url = '',
$app_key = '',
$email_driver = 'mail',
$email_smtp_server = 'smtp.mailgun.org',
$email_smtp_server_port = 587,
$email_smtp_server_user = '',
$email_smtp_server_password = '',
) {
class { 'openstack_project::server':
@ -78,6 +83,11 @@ class openstack_project::openstackid_prod (
app_url => $app_url,
app_key => $app_key,
app_version => $release,
email_driver => $email_driver,
email_smtp_server => $email_smtp_server,
email_smtp_server_port => $email_smtp_server_port,
email_smtp_server_user => $email_smtp_server_user,
email_smtp_server_password => $email_smtp_server_password,
}
# redis (custom module written by tipit)