From a9310440c14fc236292a61a64ab38d34c827e1be Mon Sep 17 00:00:00 2001 From: stephane Date: Fri, 10 Apr 2015 14:56:04 -0700 Subject: [PATCH] Add default from address Zanata needs a default from address to send out email, which users will need in order to register for accounts, etc. Change-Id: I20748336e423f8231bd42e73082a684c750d9dc8 --- manifests/site.pp | 1 + .../manifests/translate_dev.pp | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 35bd4814f1..a6a64fd1ae 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -744,6 +744,7 @@ node 'translate-dev.openstack.org' { admin_users => 'lyz,stephane', openid_url => 'https://openstackid-dev.openstack.org', listeners => ['ajp'], + from_address => 'noreply@openstack.org', mysql_host => hiera('translate_dev_mysql_host', 'localhost'), mysql_password => hiera('translate_dev_mysql_password', 'XXX'), } diff --git a/modules/openstack_project/manifests/translate_dev.pp b/modules/openstack_project/manifests/translate_dev.pp index 92e9635737..136ee520f1 100644 --- a/modules/openstack_project/manifests/translate_dev.pp +++ b/modules/openstack_project/manifests/translate_dev.pp @@ -30,6 +30,7 @@ class openstack_project::translate_dev( $ssl_key_file_contents = '', # If left empty puppet will not create file. $ssl_chain_file_contents = '', # If left empty puppet will not create file. $listeners = [], + $from_address = '', ) { class { 'openstack_project::server': @@ -38,14 +39,15 @@ class openstack_project::translate_dev( } class { '::zanata': - mysql_host => $mysql_host, - mysql_port => $mysql_port, - zanata_db_username => $mysql_user, - zanata_db_password => $mysql_password, - zanata_openid_provider_url => $openid_url, - zanata_listeners => $listeners, - zanata_admin_users => $admin_users, - require => [ + mysql_host => $mysql_host, + mysql_port => $mysql_port, + zanata_db_username => $mysql_user, + zanata_db_password => $mysql_password, + zanata_openid_provider_url => $openid_url, + zanata_listeners => $listeners, + zanata_admin_users => $admin_users, + zanata_default_from_address => $from_address, + require => [ Class['openstack_project::server'] ], }