opendev/system-config
Code Issues Proposed changes

Merge "Add default from address"

Browse Source
This commit is contained in:
Jenkins 2015-04-13 16:16:02 +00:00 committed by Gerrit Code Review
commit a89499096d
2 changed files with 11 additions and 8 deletions
manifests
site.pp
modules/openstack_project/manifests
translate_dev.pp

1
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'),
}

18
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']
],
}