opendev/system-config
Code Issues Proposed changes

Switch storyboard to LE cert

Browse Source 
Once we are happy with the newly provisioned LE cert for storyboard we
can land this change to swap apache2 over to it.

Change-Id: Ib77ce8c0b6927a85f09b857ca67ad56059898a84
This commit is contained in:
Clark Boylan 2021-05-24 12:41:11 -07:00
parent ff99f21404
commit a36b76bb51
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/site.pp
View File

@ -165,11 +165,9 @@ node /^storyboard\d+\.opendev\.org$/ {
mysql_password => hiera('storyboard_db_password'), mysql_password => hiera('storyboard_db_password'),
rabbitmq_user => hiera('storyboard_rabbit_user', 'username'), rabbitmq_user => hiera('storyboard_rabbit_user', 'username'),
rabbitmq_password => hiera('storyboard_rabbit_password'), rabbitmq_password => hiera('storyboard_rabbit_password'),
ssl_cert => '/etc/ssl/certs/storyboard.openstack.org.pem', ssl_cert => '/etc/letsencrypt-certs/storyboard.openstack.org/storyboard.openstack.org.cer',
ssl_cert_file_contents => hiera('storyboard_ssl_cert_file_contents'), ssl_key => '/etc/letsencrypt-certs/storyboard.openstack.org/storyboard.openstack.org.key',
ssl_key => '/etc/ssl/private/storyboard.openstack.org.key', ssl_ca => '/etc/letsencrypt-certs/storyboard.openstack.org/ca.cer',
ssl_key_file_contents => hiera('storyboard_ssl_key_file_contents'),
ssl_chain_file_contents => hiera('storyboard_ssl_chain_file_contents'),
hostname => 'storyboard.openstack.org', hostname => 'storyboard.openstack.org',
valid_oauth_clients => ['storyboard.openstack.org',], valid_oauth_clients => ['storyboard.openstack.org',],
cors_allowed_origins => ['https://storyboard.openstack.org',], cors_allowed_origins => ['https://storyboard.openstack.org',],

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

@ -12,6 +12,7 @@ class openstack_project::storyboard(
$ssl_cert_file_contents = undef, $ssl_cert_file_contents = undef,
$ssl_key = undef, $ssl_key = undef,
$ssl_key_file_contents = undef, $ssl_key_file_contents = undef,
$ssl_ca = undef,
$ssl_chain_file_contents = undef, $ssl_chain_file_contents = undef,
$openid_url = 'https://login.ubuntu.com/+openid', $openid_url = 'https://login.ubuntu.com/+openid',
$project_config_repo = '', $project_config_repo = '',
@ -45,6 +46,7 @@ class openstack_project::storyboard(
ssl_key_content => $ssl_key_file_contents, ssl_key_content => $ssl_key_file_contents,
ssl_key => $ssl_key, ssl_key => $ssl_key,
ssl_ca_content => $ssl_chain_file_contents, ssl_ca_content => $ssl_chain_file_contents,
ssl_ca => $ssl_ca,
} }
class { '::storyboard::application': class { '::storyboard::application':