opendev/system-config
Code Issues Proposed changes

Use jenkins credentials store with d-g

Browse Source 
on the new jenkins systems.

Change-Id: I9d6c079abcc75cd0cf0acb3bcdad15be5a87ce28
This commit is contained in:
James E. Blair 2013-08-05 15:53:01 -07:00
parent 6321e7b42f
commit b4d1b7f3a2
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -417,6 +417,7 @@ node 'devstack-launch01.slave.openstack.org' {
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
jenkins_server => 'jenkins01.openstack.org', jenkins_server => 'jenkins01.openstack.org',
jenkins_credentials_id => '8bcc2a78-0ce9-4383-aa14-039da7daf335',
} }
} }
@ -428,6 +429,7 @@ node 'devstack-launch02.slave.openstack.org' {
jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key, jenkins_ssh_public_key => $openstack_project::jenkins_ssh_key,
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'), jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents'),
jenkins_server => 'jenkins02.openstack.org', jenkins_server => 'jenkins02.openstack.org',
jenkins_credentials_id => '8bcc2a78-0ce9-4383-aa14-039da7daf335',
} }
} }

1
modules/openstack_project/manifests/devstack_launch_slave.pp
View File

@ -20,6 +20,7 @@ class openstack_project::devstack_launch_slave (
$jenkins_ssh_public_key, $jenkins_ssh_public_key,
$jenkins_ssh_private_key, $jenkins_ssh_private_key,
$jenkins_server, $jenkins_server,
$jenkins_credentials_id = '',
) { ) {
class { 'openstack_project::slave': class { 'openstack_project::slave':

3
modules/openstack_project/templates/devstack-gate-secure.conf.erb
View File

@ -2,3 +2,6 @@
server=https://<%= jenkins_server %> server=https://<%= jenkins_server %>
user=<%= jenkins_api_user %> user=<%= jenkins_api_user %>
apikey=<%= jenkins_api_key %> apikey=<%= jenkins_api_key %>
<% if jenkins_credentials_id != "" -%>
credentials_id=<%= jenkins_credentials_id %>
<% end -%>