opendev/system-config
Code Issues Proposed changes

Pass storyboard cert/key paths via global manifest

Browse Source 
Since we want to use different certificate and key file paths in
openstack_project::storyboard::dev we need to be able to default
them through openstack_project::storyboard, so set them from the
global site manifest instead of hard-coding them in the class.

Change-Id: Ifc92d78f081fc69d804c29033e96e1c94462213b
This commit is contained in:
Jeremy Stanley 2016-05-18 15:28:14 +00:00
parent 43709f9a50
commit c27f088572
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -631,7 +631,9 @@ node 'storyboard.openstack.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_file_contents => hiera('storyboard_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('storyboard_ssl_cert_file_contents'),
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 => $::fqdn,

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

@ -7,7 +7,9 @@ class openstack_project::storyboard(
$rabbitmq_user = 'storyboard', $rabbitmq_user = 'storyboard',
$rabbitmq_password, $rabbitmq_password,
$sysadmins = [], $sysadmins = [],
$ssl_cert = undef,
$ssl_cert_file_contents = undef, $ssl_cert_file_contents = undef,
$ssl_key = undef,
$ssl_key_file_contents = undef, $ssl_key_file_contents = undef,
$ssl_chain_file_contents = undef, $ssl_chain_file_contents = undef,
$openid_url = 'https://login.launchpad.net/+openid', $openid_url = 'https://login.launchpad.net/+openid',
@ -74,9 +76,9 @@ class openstack_project::storyboard(
class { '::storyboard::cert': class { '::storyboard::cert':
ssl_cert_content => $ssl_cert_file_contents, ssl_cert_content => $ssl_cert_file_contents,
ssl_cert => '/etc/ssl/certs/storyboard.openstack.org.pem', ssl_cert => $ssl_cert,
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 => $ssl_key,
ssl_ca_content => $ssl_chain_file_contents, ssl_ca_content => $ssl_chain_file_contents,
} }