opendev/system-config
Code Issues Proposed changes

Added CORS allowed domains to storyboard server config.

Browse Source 
Adds docs-draft and storyboard to the list of permitted CORS domains.
This depends on https://review.openstack.org/#/c/124197/, which
depends on https://review.openstack.org/#/c/124163/.

Also handled a couple of formatting nits.

Change-Id: I70d9fd1e133bef8bcbc34beed0c4039eb84d0bf0
This commit is contained in:
Michael Krotscheck 2014-09-25 15:05:49 -07:00
parent e30f37376d
commit 92228ebbc1
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,11 +28,16 @@ class openstack_project::storyboard(
ssl_cert => '/etc/ssl/certs/storyboard.openstack.org.pem', ssl_cert => '/etc/ssl/certs/storyboard.openstack.org.pem',
ssl_key_content => $ssl_key_file_contents, ssl_key_content => $ssl_key_file_contents,
ssl_key => '/etc/ssl/private/storyboard.openstack.org.key', ssl_key => '/etc/ssl/private/storyboard.openstack.org.key',
ssl_ca_content => $ssl_chain_file_contents ssl_ca_content => $ssl_chain_file_contents,
} }
class { '::storyboard::application': class { '::storyboard::application':
hostname => $::fqdn, hostname => $::fqdn,
cors_allowed_origins => [
'https://storyboard.openstack.org',
'http://docs-draft.openstack.org',
],
cors_max_age => 3600,
openid_url => $openid_url, openid_url => $openid_url,
mysql_host => $mysql_host, mysql_host => $mysql_host,
mysql_database => 'storyboard', mysql_database => 'storyboard',
@ -42,12 +47,12 @@ class openstack_project::storyboard(
rabbitmq_port => 5672, rabbitmq_port => 5672,
rabbitmq_vhost => '/', rabbitmq_vhost => '/',
rabbitmq_user => $rabbitmq_user, rabbitmq_user => $rabbitmq_user,
rabbitmq_user_password => $rabbitmq_password rabbitmq_user_password => $rabbitmq_password,
} }
class { '::storyboard::rabbit': class { '::storyboard::rabbit':
rabbitmq_user => $rabbitmq_user, rabbitmq_user => $rabbitmq_user,
rabbitmq_user_password => $rabbitmq_password rabbitmq_user_password => $rabbitmq_password,
} }
# Load the projects into the database. # Load the projects into the database.