opendev/system-config
Code Issues Proposed changes

Prepare for storyboard server replacement

Browse Source 
Like recently done with storyboard-dev, switch storyboard to a host
group and use an explicit vhost name so that the site can be
divorced from the hostname of the instance providing it.

Change-Id: Iacb91cb6f22dee239bd51347d17c10a7bcb01a33
This commit is contained in:
Jeremy Stanley 2019-01-20 18:06:21 +00:00
parent c4466665bb
commit 628b7cce51
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -560,6 +560,7 @@ node /^refstack\d*\.open.*\.org$/ {
# Node-OS: trusty # Node-OS: trusty
# Node-OS: xenial # Node-OS: xenial
node /^storyboard\d*\.open.*\.org$/ { node /^storyboard\d*\.open.*\.org$/ {
$group = "storyboard"
class { 'openstack_project::storyboard': class { 'openstack_project::storyboard':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
mysql_host => hiera('storyboard_db_host', 'localhost'), mysql_host => hiera('storyboard_db_host', 'localhost'),
@ -572,13 +573,13 @@ node /^storyboard\d*\.open.*\.org$/ {
ssl_key => '/etc/ssl/private/storyboard.openstack.org.key', ssl_key => '/etc/ssl/private/storyboard.openstack.org.key',
ssl_key_file_contents => hiera('storyboard_ssl_key_file_contents'), ssl_key_file_contents => hiera('storyboard_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents'), ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents'),
hostname => $::fqdn, hostname => 'storyboard.openstack.org',
valid_oauth_clients => [ valid_oauth_clients => [
$::fqdn, 'storyboard.openstack.org',
'logs.openstack.org', 'logs.openstack.org',
], ],
cors_allowed_origins => [ cors_allowed_origins => [
"https://${::fqdn}", 'https://storyboard.openstack.org',
'http://logs.openstack.org', 'http://logs.openstack.org',
], ],
sender_email_address => 'storyboard@storyboard.openstack.org', sender_email_address => 'storyboard@storyboard.openstack.org',