opendev/system-config
Code Issues Proposed changes

Merge "Expose jenkins_ssh_public_key parameter in openstack_project::jenkins"

Browse Source
This commit is contained in:
Jenkins 2014-12-19 13:56:29 +00:00 committed by Gerrit Code Review
commit dc444176bc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,11 +13,12 @@ class openstack_project::jenkins (
$ssl_cert_file_contents = '', $ssl_cert_file_contents = '',
$ssl_key_file_contents = '', $ssl_key_file_contents = '',
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
$jenkins_ssh_public_key = $openstack_project::jenkins_ssh_key,
$jenkins_ssh_private_key = '', $jenkins_ssh_private_key = '',
$zmq_event_receivers = [], $zmq_event_receivers = [],
$sysadmins = [], $sysadmins = [],
$project_config_repo = '', $project_config_repo = '',
) { ) inherits openstack_project {
include openstack_project include openstack_project
$iptables_rule = regsubst ($zmq_event_receivers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 8888 -s \1 -j ACCEPT') $iptables_rule = regsubst ($zmq_event_receivers, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 8888 -s \1 -j ACCEPT')
@ -54,7 +55,7 @@ class openstack_project::jenkins (
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,
jenkins_ssh_private_key => $jenkins_ssh_private_key, jenkins_ssh_private_key => $jenkins_ssh_private_key,
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_public_key => $jenkins_ssh_public_key,
} }
jenkins::plugin { 'build-timeout': jenkins::plugin { 'build-timeout':