opendev/system-config
Code Issues Proposed changes

Merge "Override the default_url for StoryBoard servers"

Browse Source
This commit is contained in:
Zuul 2018-04-24 14:33:19 +00:00 committed by Gerrit Code Review
commit 707b08a52e
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -792,6 +792,7 @@ node /^storyboard\d*\.openstack\.org$/ {
'http://logs.openstack.org', 'http://logs.openstack.org',
], ],
sender_email_address => 'storyboard@storyboard.openstack.org', sender_email_address => 'storyboard@storyboard.openstack.org',
default_url => 'https://storyboard.openstack.org',
} }
} }
@ -817,6 +818,7 @@ node /^storyboard-dev\d*\.openstack\.org$/ {
'http://logs.openstack.org', 'http://logs.openstack.org',
], ],
sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org', sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org',
default_url => 'https://storyboard-dev.openstack.org',
} }
} }

2
modules/openstack_project/manifests/storyboard.pp
View File

@ -20,6 +20,7 @@ class openstack_project::storyboard(
$valid_oauth_clients = [$::fqdn], $valid_oauth_clients = [$::fqdn],
$cors_allowed_origins = ["https://${::fqdn}"], $cors_allowed_origins = ["https://${::fqdn}"],
$sender_email_address = undef, $sender_email_address = undef,
$default_url = undef,
) { ) {
class { 'project_config': class { 'project_config':
@ -100,6 +101,7 @@ class openstack_project::storyboard(
rabbitmq_user => $rabbitmq_user, rabbitmq_user => $rabbitmq_user,
rabbitmq_user_password => $rabbitmq_password, rabbitmq_user_password => $rabbitmq_password,
sender_email_address => $sender_email_address, sender_email_address => $sender_email_address,
default_url => $default_url,
} }
class { '::storyboard::rabbit': class { '::storyboard::rabbit':

2
modules/openstack_project/manifests/storyboard/dev.pp
View File

@ -16,6 +16,7 @@ class openstack_project::storyboard::dev(
$valid_oauth_clients = [$::fqdn], $valid_oauth_clients = [$::fqdn],
$cors_allowed_origins = ["https://${::fqdn}"], $cors_allowed_origins = ["https://${::fqdn}"],
$sender_email_address = undef, $sender_email_address = undef,
$default_url = undef,
) { ) {
class { 'openstack_project::storyboard': class { 'openstack_project::storyboard':
@ -35,6 +36,7 @@ class openstack_project::storyboard::dev(
valid_oauth_clients => $valid_oauth_clients, valid_oauth_clients => $valid_oauth_clients,
cors_allowed_origins => $cors_allowed_origins, cors_allowed_origins => $cors_allowed_origins,
sender_email_address => $sender_email_address, sender_email_address => $sender_email_address,
default_url => $default_url,
} }
realize ( realize (