opendev/system-config
Code Issues Proposed changes

use updated jenkins_master.pp manifest

Browse Source 
Jenkins job builder setup was moved into openstackci::jenkins_master
and some of the params names were changes so need to update usage of
the params accordingly.

Change-Id: Id10d63745fff43f3188e630df38c8c9ba97c3e17
depends-on: I50d4d2dd4209250e14ceeb7ff8ddf5b6ba3e2ad4
needed-by: I8d50577fcc0b0a5dbce822eef15bacfaf0453947
This commit is contained in:
Khai Do 2015-07-08 16:40:25 -07:00
parent c980672d9c
commit d9714e0f9a
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -132,7 +132,7 @@ node 'jenkins.openstack.org' {
} }
class { 'openstack_project::jenkins': class { 'openstack_project::jenkins':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
jenkins_jobs_password => hiera('jenkins_jobs_password', 'XXX'), jenkins_password => hiera('jenkins_jobs_password', 'XXX'),
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'), jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
ssl_cert_file_contents => hiera('jenkins_ssl_cert_file_contents', 'XXX'), ssl_cert_file_contents => hiera('jenkins_ssl_cert_file_contents', 'XXX'),
ssl_key_file_contents => hiera('jenkins_ssl_key_file_contents', 'XXX'), ssl_key_file_contents => hiera('jenkins_ssl_key_file_contents', 'XXX'),
@ -155,7 +155,7 @@ node /^jenkins\d+\.openstack\.org$/ {
puppetmaster_server => 'puppetmaster.openstack.org', puppetmaster_server => 'puppetmaster.openstack.org',
} }
class { 'openstack_project::jenkins': class { 'openstack_project::jenkins':
jenkins_jobs_password => hiera('jenkins_jobs_password', 'XXX'), jenkins_password => hiera('jenkins_jobs_password', 'XXX'),
jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'), jenkins_ssh_private_key => hiera('jenkins_ssh_private_key_contents', 'XXX'),
ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem', ssl_cert_file => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key', ssl_key_file => '/etc/ssl/private/ssl-cert-snakeoil.key',

32
modules/openstack_project/manifests/jenkins.pp
View File

@ -2,11 +2,8 @@
# #
class openstack_project::jenkins ( class openstack_project::jenkins (
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
$jenkins_jobs_password = '', $jenkins_password = '',
$jenkins_jobs_username = 'gerrig', # This is not a typo, well it isn't anymore. $jenkins_username = 'gerrig', # This is not a typo, well it isn't anymore.
$jenkins_git_url = 'https://git.openstack.org/openstack-infra/jenkins-job-builder',
$jenkins_git_revision = 'master',
$manage_jenkins_jobs = true,
$ssl_cert_file = '', $ssl_cert_file = '',
$ssl_key_file = '', $ssl_key_file = '',
$ssl_chain_file = '/etc/ssl/certs/intermediate.pem', $ssl_chain_file = '/etc/ssl/certs/intermediate.pem',
@ -16,6 +13,7 @@ class openstack_project::jenkins (
$jenkins_ssh_public_key = $openstack_project::jenkins_ssh_key, $jenkins_ssh_public_key = $openstack_project::jenkins_ssh_key,
$jenkins_ssh_private_key = '', $jenkins_ssh_private_key = '',
$project_config_repo = '', $project_config_repo = '',
$project_config_base = '',
$serveradmin = 'webmaster@openstack.org', $serveradmin = 'webmaster@openstack.org',
$logo = 'openstack.png', $logo = 'openstack.png',
) inherits openstack_project { ) inherits openstack_project {
@ -48,23 +46,11 @@ class openstack_project::jenkins (
ssl_chain_file_contents => $ssl_chain_file_contents, ssl_chain_file_contents => $ssl_chain_file_contents,
jenkins_ssh_private_key => $jenkins_ssh_private_key, jenkins_ssh_private_key => $jenkins_ssh_private_key,
jenkins_ssh_public_key => $jenkins_ssh_public_key, jenkins_ssh_public_key => $jenkins_ssh_public_key,
} project_config_repo => $project_config_repo,
project_config_base => $project_config_base,
if $manage_jenkins_jobs == true { jenkins_username => $jenkins_username,
class { 'project_config': jenkins_password => $jenkins_password,
url => $project_config_repo, jenkins_url => "https://${vhost_name}/",
} manage_jenkins_jobs => true,
class { '::jenkins::job_builder':
jenkins_jobs_update_timeout => 1200,
url => "https://${vhost_name}/",
username => $jenkins_jobs_username,
password => $jenkins_jobs_password,
git_revision => $jenkins_git_revision,
git_url => $jenkins_git_url,
config_dir =>
$::project_config::jenkins_job_builder_config_dir,
require => $::project_config::config_dir,
}
} }
} }