opendev/system-config
Code Issues Proposed changes

Added openstackid dev sendgrid support

Browse Source 
updated openstackid dev node configuration
to use sendgrid api key from hiera

Depends-On: https://review.openstack.org/#/c/651794/
Depends-On: https://review.openstack.org/#/c/651798/
Change-Id: I9fc5e9b24886105771a1be93d8d8a6c6e1189c32
This commit is contained in:
smarcet 2019-04-11 11:48:52 -03:00
parent 65d9a8739a
commit d6c2d3ab9e
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

@ -1182,10 +1182,8 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
app_key => hiera('openstackid_dev_app_key'), app_key => hiera('openstackid_dev_app_key'),
id_log_error_to_email => 'openstack@tipit.net', id_log_error_to_email => 'openstack@tipit.net',
id_log_error_from_email => 'noreply@openstack.org', id_log_error_from_email => 'noreply@openstack.org',
email_driver => 'smtp', email_driver => 'sendgrid',
email_smtp_server => 'smtp.sendgrid.net', email_send_grid_api_key => hiera('openstackid_dev_send_grid_api_key'),
email_smtp_server_user => hiera('openstackid_dev_smtp_user'),
email_smtp_server_password => hiera('openstackid_dev_smtp_password'),
php_version => 7, php_version => 7,
mysql_ssl_enabled => true, mysql_ssl_enabled => true,
mysql_ssl_ca_file_contents => hiera('openstackid_dev_mysql_ssl_ca_file_contents'), 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_url = '',
$app_key = '', $app_key = '',
$email_driver = 'mail', $email_driver = 'mail',
$email_send_grid_api_key = '',
$email_smtp_server = 'smtp.mailgun.org', $email_smtp_server = 'smtp.mailgun.org',
$email_smtp_server_port = 587, $email_smtp_server_port = 587,
$email_smtp_server_user = '', $email_smtp_server_user = '',
@ -108,6 +109,7 @@ class openstack_project::openstackid_dev (
app_url => $app_url, app_url => $app_url,
app_key => $app_key, app_key => $app_key,
email_driver => $email_driver, email_driver => $email_driver,
email_send_grid_api_key => $email_send_grid_api_key,
email_smtp_server => $email_smtp_server, email_smtp_server => $email_smtp_server,
email_smtp_server_port => $email_smtp_server_port, email_smtp_server_port => $email_smtp_server_port,
email_smtp_server_user => $email_smtp_server_user, email_smtp_server_user => $email_smtp_server_user,