opendev/system-config
Code Issues Proposed changes

Merge "Use new api for jenkins masters credentials"

Browse Source
This commit is contained in:
Jenkins 2015-08-18 23:53:15 +00:00 committed by Gerrit Code Review
commit b4e9055f6e
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

@ -590,6 +590,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

@ -11,6 +11,7 @@ class openstack_project::nodepool_prod(
$jenkins_api_user ='',
$jenkins_api_key ='',
$jenkins_credentials_id ='',
$jenkins_masters = [],
$rackspace_username ='',
$rackspace_password ='',
$rackspace_project ='',
@ -41,6 +42,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':