Merge "Move hardcoded values into jenkins class params"

This commit is contained in:
Jenkins 2015-05-12 21:36:21 +00:00 committed by Gerrit Code Review
commit c58f38482c

View File

@ -18,6 +18,8 @@ class openstack_project::jenkins (
$zmq_event_receivers = [], $zmq_event_receivers = [],
$sysadmins = [], $sysadmins = [],
$project_config_repo = '', $project_config_repo = '',
$serveradmin = 'webmaster@openstack.org',
$logo = 'openstack.png',
) inherits openstack_project { ) inherits openstack_project {
include openstack_project include openstack_project
@ -46,8 +48,8 @@ class openstack_project::jenkins (
class { '::jenkins::master': class { '::jenkins::master':
vhost_name => $vhost_name, vhost_name => $vhost_name,
serveradmin => 'webmaster@openstack.org', serveradmin => $serveradmin,
logo => 'openstack.png', logo => $logo,
ssl_cert_file => $prv_ssl_cert_file, ssl_cert_file => $prv_ssl_cert_file,
ssl_key_file => $prv_ssl_key_file, ssl_key_file => $prv_ssl_key_file,
ssl_chain_file => $ssl_chain_file, ssl_chain_file => $ssl_chain_file,