From fa0f5860d24eacbb622159a414e7011f67599f31 Mon Sep 17 00:00:00 2001 From: smarcet Date: Tue, 30 Apr 2019 13:13:38 -0300 Subject: [PATCH] Update OpenstackId Prod Node Settings moved from smtp email driver to sendgrid Change-Id: I719a3fd7e730972b7a0784a9a4857a76672119d0 --- manifests/site.pp | 6 ++---- modules/openstack_project/manifests/openstackid_prod.pp | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 1db3cbb2b4..d9eef6fe19 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1105,10 +1105,8 @@ node /^openstackid\d*(\.openstack)?\.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'), + email_driver => 'sendgrid', + email_send_grid_api_key => hiera('openstackid_send_grid_api_key'), php_version => 7, mysql_ssl_enabled => true, mysql_ssl_ca_file_contents => hiera('openstackid_mysql_ssl_ca_file_contents'), diff --git a/modules/openstack_project/manifests/openstackid_prod.pp b/modules/openstack_project/manifests/openstackid_prod.pp index fcea11d318..ce1cf0a68f 100644 --- a/modules/openstack_project/manifests/openstackid_prod.pp +++ b/modules/openstack_project/manifests/openstackid_prod.pp @@ -46,6 +46,7 @@ class openstack_project::openstackid_prod ( $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 = '',