From 76eff993eda4f638bb4f653d5d5d85195c0a76aa Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Fri, 14 Nov 2014 11:10:25 +0000 Subject: [PATCH] Expose jenkins_ssh_public_key parameter in openstack_project::jenkins The jenkins ssh public key is not parameterized in the class, it's currently hardcoded and referenced from openstack_project::init.pp. Adding parameter allows user to use its own jenkins public ssh key. Change-Id: I20c99ffe7c9d462f91a9d1cc580302e45eaae3ed --- modules/openstack_project/manifests/jenkins.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/jenkins.pp b/modules/openstack_project/manifests/jenkins.pp index 7f56d3cc19..c7720bd932 100644 --- a/modules/openstack_project/manifests/jenkins.pp +++ b/modules/openstack_project/manifests/jenkins.pp @@ -13,11 +13,12 @@ class openstack_project::jenkins ( $ssl_cert_file_contents = '', $ssl_key_file_contents = '', $ssl_chain_file_contents = '', + $jenkins_ssh_public_key = $openstack_project::jenkins_ssh_key, $jenkins_ssh_private_key = '', $zmq_event_receivers = [], $sysadmins = [], $project_config_repo = '', -) { +) inherits 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') @@ -54,7 +55,7 @@ class openstack_project::jenkins ( ssl_key_file_contents => $ssl_key_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents, 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':