diff --git a/manifests/site.pp b/manifests/site.pp index 7eb8ce13f3..fd62719869 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'), diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp index c321bcafef..f280fd3203 100644 --- a/modules/openstack_project/manifests/nodepool_prod.pp +++ b/modules/openstack_project/manifests/nodepool_prod.pp @@ -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':