opendev/system-config
Code Issues Proposed changes

Use new api for jenkins masters credentials

Browse Source 
In Ie9381740e3644feaee1f1b201499e3a253677f39 we created a new parameter
for the jenkins masters credentials as part of a move to put credentials
in their own config file.

Depends-On: Ie9381740e3644feaee1f1b201499e3a253677f39
Change-Id: I774b03ad49b232a11c0046dda5e0364bb1dcaede
This commit is contained in:
K Jonathan Harker 2015-07-08 13:58:36 -07:00
parent 177c538b98
commit 012a9293e2
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
manifests/site.pp
View File

@ -536,6 +536,57 @@ node 'nodepool.openstack.org' {
jenkins_api_user => hiera('jenkins_api_user', 'username'),
jenkins_api_key => hiera('jenkins_api_key', 'XXX'),
jenkins_credentials_id => hiera('jenkins_credentials_id', 'XXX'),
jenkins_masters => [
{
name => 'jenkins01',
url => 'https://jenkins01.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key', 'XXX'),
credentials => hiera('jenkins_credentials_id', 'XXX'),
},
{
name => 'jenkins02',
url => 'https://jenkins02.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key', 'XXX'),
credentials => hiera('jenkins_credentials_id', 'XXX'),
},
{
name => 'jenkins03',
url => 'https://jenkins03.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key', 'XXX'),
credentials => hiera('jenkins_credentials_id', 'XXX'),
},
{
name => 'jenkins04',
url => 'https://jenkins04.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key', 'XXX'),
credentials => hiera('jenkins_credentials_id', 'XXX'),
},
{
name => 'jenkins05',
url => 'https://jenkins05.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key', 'XXX'),
credentials => hiera('jenkins_credentials_id', 'XXX'),
},
{
name => 'jenkins06',
url => 'https://jenkins06.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key', 'XXX'),
credentials => hiera('jenkins_credentials_id', 'XXX'),
},
{
name => 'jenkins07',
url => 'https://jenkins07.openstack.org/',
user => hiera('jenkins_api_user', 'username'),
apikey => hiera('jenkins_api_key', 'XXX'),
credentials => hiera('jenkins_credentials_id', 'XXX'),
},
],
rackspace_username => hiera('nodepool_rackspace_username', 'username'),
rackspace_password => hiera('nodepool_rackspace_password', 'XXX'),
rackspace_project => hiera('nodepool_rackspace_project', 'project'),

2
modules/openstack_project/manifests/nodepool_prod.pp
View File

@ -12,6 +12,7 @@ class openstack_project::nodepool_prod(
$jenkins_api_user ='',
$jenkins_api_key ='',
$jenkins_credentials_id ='',
$jenkins_masters = [],
$rackspace_username ='',
$rackspace_password ='',
$rackspace_project ='',
@ -47,6 +48,7 @@ class openstack_project::nodepool_prod(
elements_dir => $::project_config::nodepool_elements_dir,
require => $::project_config::config_dir,
logging_conf_template => $nodepool_logging_template,
jenkins_masters => $jenkins_masters,
}
file { '/etc/nodepool/nodepool.yaml':