From 012a9293e211d7c5a1c9d6a2d1f1eb464492f2b6 Mon Sep 17 00:00:00 2001 From: K Jonathan Harker Date: Wed, 8 Jul 2015 13:58:36 -0700 Subject: [PATCH] Use new api for jenkins masters credentials 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 --- manifests/site.pp | 51 +++++++++++++++++++ .../manifests/nodepool_prod.pp | 2 + 2 files changed, 53 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index 9deb195042..92205151f1 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'), diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp index 936c319bff..6d8e9be04c 100644 --- a/modules/openstack_project/manifests/nodepool_prod.pp +++ b/modules/openstack_project/manifests/nodepool_prod.pp @@ -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':