From 0a7f6331b9209dda4cae4ba288e7673e8821a9de Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Tue, 24 Mar 2015 15:58:10 +0000 Subject: [PATCH] Move hardcoded values into jenkins class params Move serveradmin and logo to openstack_project::jenkins class and keep hardcoded values as default values. Change-Id: Ifb3ee06c927b175340e53a1ffad116a21f303075 --- modules/openstack_project/manifests/jenkins.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp index ff401cebe0..c46e4e1f8f 100644 --- a/modules/openstack_project/manifests/jenkins.pp +++ b/modules/openstack_project/manifests/jenkins.pp @@ -18,6 +18,8 @@ class openstack_project::jenkins ( $zmq_event_receivers = [], $sysadmins = [], $project_config_repo = '', + $serveradmin = 'webmaster@openstack.org', + $logo = 'openstack.png', ) inherits openstack_project { include openstack_project @@ -46,8 +48,8 @@ class openstack_project::jenkins ( class { '::jenkins::master': vhost_name => $vhost_name, - serveradmin => 'webmaster@openstack.org', - logo => 'openstack.png', + serveradmin => $serveradmin, + logo => $logo, ssl_cert_file => $prv_ssl_cert_file, ssl_key_file => $prv_ssl_key_file, ssl_chain_file => $ssl_chain_file,