From 4ce4fc209dce9be7c9724d227f7355fe9cf6e360 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 2 Aug 2013 23:58:30 +0000 Subject: [PATCH] Don't write jenkins ssl chain file if no contents Change-Id: I66e6046e911d43e505187c5c900fd796f406fb00 --- modules/openstack_project/manifests/jenkins.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp index 8592e27373..b957b813c6 100644 --- a/modules/openstack_project/manifests/jenkins.pp +++ b/modules/openstack_project/manifests/jenkins.pp @@ -21,13 +21,19 @@ class openstack_project::jenkins ( sysadmins => $sysadmins, } + if $ssl_chain_file_contents != '' { + $ssl_chain_file = '/etc/ssl/certs/intermediate.pem' + } else { + $ssl_chain_file = '' + } + class { '::jenkins::master': vhost_name => $vhost_name, serveradmin => 'webmaster@openstack.org', logo => 'openstack.png', ssl_cert_file => "/etc/ssl/certs/${vhost_name}.pem", 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_key_file_contents => $ssl_key_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,