opendev/system-config
Code Issues Proposed changes

Merge "Added Valid OAuth client configuration to storyboard manifest."

Browse Source
This commit is contained in:
Jenkins 2015-03-16 16:09:13 +00:00 committed by Gerrit Code Review
commit ae8d1ec90f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -424,7 +424,11 @@ node 'storyboard.openstack.org' {
rabbitmq_password => hiera('storyboard_rabbit_password', 'XXX'), rabbitmq_password => hiera('storyboard_rabbit_password', 'XXX'),
ssl_cert_file_contents => hiera('storyboard_ssl_cert_file_contents', 'XXX'), ssl_cert_file_contents => hiera('storyboard_ssl_cert_file_contents', 'XXX'),
ssl_key_file_contents => hiera('storyboard_ssl_key_file_contents', 'XXX'), ssl_key_file_contents => hiera('storyboard_ssl_key_file_contents', 'XXX'),
ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents', 'XXX') ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents', 'XXX'),
valid_oauth_clients => [
$::fqdn,
'docs-draft.openstack.org',
],
} }
} }

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

@ -12,6 +12,7 @@ class openstack_project::storyboard(
$ssl_chain_file_contents = undef, $ssl_chain_file_contents = undef,
$openid_url = 'https://login.launchpad.net/+openid', $openid_url = 'https://login.launchpad.net/+openid',
$project_config_repo = '', $project_config_repo = '',
$valid_oauth_clients = [],
) { ) {
class { 'project_config': class { 'project_config':
@ -44,6 +45,7 @@ class openstack_project::storyboard(
'https://storyboard.openstack.org', 'https://storyboard.openstack.org',
'http://docs-draft.openstack.org', 'http://docs-draft.openstack.org',
], ],
valid_oauth_clients => $valid_oauth_clients,
cors_max_age => 3600, cors_max_age => 3600,
openid_url => $openid_url, openid_url => $openid_url,
mysql_host => $mysql_host, mysql_host => $mysql_host,