From 92228ebbc13227eda2e800f0cbda69e35fd4ecf3 Mon Sep 17 00:00:00 2001 From: Michael Krotscheck <krotscheck@gmail.com> Date: Thu, 25 Sep 2014 15:05:49 -0700 Subject: [PATCH] Added CORS allowed domains to storyboard server config. 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 --- modules/openstack_project/manifests/storyboard.pp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp index 8272d6e609..f91e807b50 100644 --- a/modules/openstack_project/manifests/storyboard.pp +++ b/modules/openstack_project/manifests/storyboard.pp @@ -28,11 +28,16 @@ class openstack_project::storyboard( ssl_cert => '/etc/ssl/certs/storyboard.openstack.org.pem', ssl_key_content => $ssl_key_file_contents, 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': hostname => $::fqdn, + cors_allowed_origins => [ + 'https://storyboard.openstack.org', + 'http://docs-draft.openstack.org', + ], + cors_max_age => 3600, openid_url => $openid_url, mysql_host => $mysql_host, mysql_database => 'storyboard', @@ -42,12 +47,12 @@ class openstack_project::storyboard( rabbitmq_port => 5672, rabbitmq_vhost => '/', rabbitmq_user => $rabbitmq_user, - rabbitmq_user_password => $rabbitmq_password + rabbitmq_user_password => $rabbitmq_password, } class { '::storyboard::rabbit': rabbitmq_user => $rabbitmq_user, - rabbitmq_user_password => $rabbitmq_password + rabbitmq_user_password => $rabbitmq_password, } # Load the projects into the database.