opendev/system-config
Code Issues Proposed changes

Add default from address

Browse Source 
Zanata needs a default from address to send out email, which users
will need in order to register for accounts, etc.

Change-Id: I20748336e423f8231bd42e73082a684c750d9dc8
This commit is contained in:
stephane 2015-04-10 14:56:04 -07:00
parent 81d0ead6cd
commit a9310440c1
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -744,6 +744,7 @@ node 'translate-dev.openstack.org' {
admin_users => 'lyz,stephane', admin_users => 'lyz,stephane',
openid_url => 'https://openstackid-dev.openstack.org', openid_url => 'https://openstackid-dev.openstack.org',
listeners => ['ajp'], listeners => ['ajp'],
from_address => 'noreply@openstack.org',
mysql_host => hiera('translate_dev_mysql_host', 'localhost'), mysql_host => hiera('translate_dev_mysql_host', 'localhost'),
mysql_password => hiera('translate_dev_mysql_password', 'XXX'), mysql_password => hiera('translate_dev_mysql_password', 'XXX'),
} }

18
modules/openstack_project/manifests/translate_dev.pp
View File

@ -30,6 +30,7 @@ class openstack_project::translate_dev(
$ssl_key_file_contents = '', # If left empty puppet will not create file. $ssl_key_file_contents = '', # If left empty puppet will not create file.
$ssl_chain_file_contents = '', # If left empty puppet will not create file. $ssl_chain_file_contents = '', # If left empty puppet will not create file.
$listeners = [], $listeners = [],
$from_address = '',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
@ -38,14 +39,15 @@ class openstack_project::translate_dev(
} }
class { '::zanata': class { '::zanata':
mysql_host => $mysql_host, mysql_host => $mysql_host,
mysql_port => $mysql_port, mysql_port => $mysql_port,
zanata_db_username => $mysql_user, zanata_db_username => $mysql_user,
zanata_db_password => $mysql_password, zanata_db_password => $mysql_password,
zanata_openid_provider_url => $openid_url, zanata_openid_provider_url => $openid_url,
zanata_listeners => $listeners, zanata_listeners => $listeners,
zanata_admin_users => $admin_users, zanata_admin_users => $admin_users,
require => [ zanata_default_from_address => $from_address,
require => [
Class['openstack_project::server'] Class['openstack_project::server']
], ],
} }