Merge "Add sender email for storyboard.openstack.org"

This commit is contained in:
Jenkins 2016-03-22 17:25:11 +00:00 committed by Gerrit Code Review
commit 88a9299b54
2 changed files with 3 additions and 0 deletions
manifests
modules/openstack_project/manifests

@ -614,6 +614,7 @@ node 'storyboard.openstack.org' {
"https://${::fqdn}", "https://${::fqdn}",
'http://docs-draft.openstack.org', 'http://docs-draft.openstack.org',
], ],
sender_email_address => 'storyboard@storyboard.openstack.org',
} }
} }

@ -15,6 +15,7 @@ class openstack_project::storyboard(
$hostname = $::fqdn, $hostname = $::fqdn,
$valid_oauth_clients = [$::fqdn], $valid_oauth_clients = [$::fqdn],
$cors_allowed_origins = ["https://${::fqdn}"], $cors_allowed_origins = ["https://${::fqdn}"],
$sender_email_address = undef,
) { ) {
class { 'project_config': class { 'project_config':
@ -94,6 +95,7 @@ class openstack_project::storyboard(
rabbitmq_vhost => '/', rabbitmq_vhost => '/',
rabbitmq_user => $rabbitmq_user, rabbitmq_user => $rabbitmq_user,
rabbitmq_user_password => $rabbitmq_password, rabbitmq_user_password => $rabbitmq_password,
sender_email_address => $sender_email_address,
} }
class { '::storyboard::rabbit': class { '::storyboard::rabbit':