opendev
/
system-config
Code Issues Proposed changes

Merge "Added openstackid dev sendgrid support"

This commit is contained in:
Zuul 2019-04-16 18:08:20 +00:00 committed by Gerrit Code Review
parent 671250095d d6c2d3ab9e
commit 4f7dd4157e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -1186,10 +1186,8 @@ node /^openstackid-dev\d*\.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'),
email_driver => 'sendgrid',
email_send_grid_api_key => hiera('openstackid_dev_send_grid_api_key'),
php_version => 7,
mysql_ssl_enabled => true,
mysql_ssl_ca_file_contents => hiera('openstackid_dev_mysql_ssl_ca_file_contents'),

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

@ -45,6 +45,7 @@ class openstack_project::openstackid_dev (
$app_url = '',
$app_key = '',
$email_driver = 'mail',
$email_send_grid_api_key = '',
$email_smtp_server = 'smtp.mailgun.org',
$email_smtp_server_port = 587,
$email_smtp_server_user = '',
@ -108,6 +109,7 @@ class openstack_project::openstackid_dev (
app_url => $app_url,
app_key => $app_key,
email_driver => $email_driver,
email_send_grid_api_key => $email_send_grid_api_key,
email_smtp_server => $email_smtp_server,
email_smtp_server_port => $email_smtp_server_port,
email_smtp_server_user => $email_smtp_server_user,