opendev/system-config
Code Issues Proposed changes

Don't write jenkins ssl chain file if no contents

Browse Source 
Change-Id: I66e6046e911d43e505187c5c900fd796f406fb00
This commit is contained in:
James E. Blair 2013-08-02 23:58:30 +00:00
parent 309a506c1e
commit 4ce4fc209d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/manifests/jenkins.pp
View File

@ -21,13 +21,19 @@ class openstack_project::jenkins (
sysadmins => $sysadmins, sysadmins => $sysadmins,
} }
if $ssl_chain_file_contents != '' {
$ssl_chain_file = '/etc/ssl/certs/intermediate.pem'
} else {
$ssl_chain_file = ''
}
class { '::jenkins::master': class { '::jenkins::master':
vhost_name => $vhost_name, vhost_name => $vhost_name,
serveradmin => 'webmaster@openstack.org', serveradmin => 'webmaster@openstack.org',
logo => 'openstack.png', logo => 'openstack.png',
ssl_cert_file => "/etc/ssl/certs/${vhost_name}.pem", ssl_cert_file => "/etc/ssl/certs/${vhost_name}.pem",
ssl_key_file => "/etc/ssl/private/${vhost_name}.key", ssl_key_file => "/etc/ssl/private/${vhost_name}.key",
ssl_chain_file => '/etc/ssl/certs/intermediate.pem', ssl_chain_file => $ssl_chain_file,
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents, ssl_key_file_contents => $ssl_key_file_contents,
ssl_chain_file_contents => $ssl_chain_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,