Browse Source

Merge "Added openstackid dev sendgrid support"

Zuul 1 month ago
parent
commit
4f7dd4157e
2 changed files with 4 additions and 4 deletions
  1. 2
    4
      manifests/site.pp
  2. 2
    0
      modules/openstack_project/manifests/openstackid_dev.pp

+ 2
- 4
manifests/site.pp View File

@@ -1186,10 +1186,8 @@ node /^openstackid-dev\d*\.openstack\.org$/ {
1186 1186
     app_key                             => hiera('openstackid_dev_app_key'),
1187 1187
     id_log_error_to_email               => 'openstack@tipit.net',
1188 1188
     id_log_error_from_email             => 'noreply@openstack.org',
1189
-    email_driver                        => 'smtp',
1190
-    email_smtp_server                   => 'smtp.sendgrid.net',
1191
-    email_smtp_server_user              => hiera('openstackid_dev_smtp_user'),
1192
-    email_smtp_server_password          => hiera('openstackid_dev_smtp_password'),
1189
+    email_driver                        => 'sendgrid',
1190
+    email_send_grid_api_key             => hiera('openstackid_dev_send_grid_api_key'),
1193 1191
     php_version                         => 7,
1194 1192
     mysql_ssl_enabled                   => true,
1195 1193
     mysql_ssl_ca_file_contents          => hiera('openstackid_dev_mysql_ssl_ca_file_contents'),

+ 2
- 0
modules/openstack_project/manifests/openstackid_dev.pp View File

@@ -45,6 +45,7 @@ class openstack_project::openstackid_dev (
45 45
   $app_url = '',
46 46
   $app_key = '',
47 47
   $email_driver = 'mail',
48
+  $email_send_grid_api_key = '',
48 49
   $email_smtp_server = 'smtp.mailgun.org',
49 50
   $email_smtp_server_port = 587,
50 51
   $email_smtp_server_user = '',
@@ -108,6 +109,7 @@ class openstack_project::openstackid_dev (
108 109
     app_url                             => $app_url,
109 110
     app_key                             => $app_key,
110 111
     email_driver                        => $email_driver,
112
+    email_send_grid_api_key             => $email_send_grid_api_key,
111 113
     email_smtp_server                   => $email_smtp_server,
112 114
     email_smtp_server_port              => $email_smtp_server_port,
113 115
     email_smtp_server_user              => $email_smtp_server_user,

Loading…
Cancel
Save