opendev/system-config
Code Issues Proposed changes

Merge "Update plugins and use files from project_config repo"

Browse Source
This commit is contained in:
Jenkins 2015-11-09 00:51:28 +00:00 committed by Gerrit Code Review
commit 6021cfae35
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -213,6 +213,7 @@ node 'jenkins-dev.openstack.org' {
puppetmaster_server => 'puppetmaster.openstack.org', puppetmaster_server => 'puppetmaster.openstack.org',
} }
class { 'openstack_project::jenkins_dev': class { 'openstack_project::jenkins_dev':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
jenkins_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents'), jenkins_ssh_private_key => hiera('jenkins_dev_ssh_private_key_contents'),
mysql_password => hiera('nodepool_dev_mysql_password'), mysql_password => hiera('nodepool_dev_mysql_password'),
mysql_root_password => hiera('nodepool_dev_mysql_root_password'), mysql_root_password => hiera('nodepool_dev_mysql_root_password'),

20
modules/openstack_project/manifests/jenkins_dev.pp
View File

@ -1,6 +1,7 @@
# == Class: openstack_project::jenkins_dev # == Class: openstack_project::jenkins_dev
# #
class openstack_project::jenkins_dev ( class openstack_project::jenkins_dev (
$project_config_repo = '',
$jenkins_ssh_private_key = '', $jenkins_ssh_private_key = '',
$mysql_root_password, $mysql_root_password,
$mysql_password, $mysql_password,
@ -64,6 +65,9 @@ class openstack_project::jenkins_dev (
# jenkins::plugin { 'scp': # jenkins::plugin { 'scp':
# version => '1.9', # version => '1.9',
# } # }
jenkins::plugin { 'jobConfigHistory':
version => '1.13',
}
jenkins::plugin { 'monitoring': jenkins::plugin { 'monitoring':
version => '1.40.0', version => '1.40.0',
} }
@ -76,6 +80,9 @@ class openstack_project::jenkins_dev (
jenkins::plugin { 'openid': jenkins::plugin { 'openid':
version => '1.5', version => '1.5',
} }
jenkins::plugin { 'postbuildscript':
version => '0.16',
}
jenkins::plugin { 'publish-over-ftp': jenkins::plugin { 'publish-over-ftp':
version => '1.7', version => '1.7',
} }
@ -118,8 +125,17 @@ class openstack_project::jenkins_dev (
recurse => true, recurse => true,
purge => true, purge => true,
force => true, force => true,
require => File['/etc/nodepool'], require => [
source => 'puppet:///modules/openstack_project/nodepool/scripts', File['/etc/nodepool'],
Class['project_config'],
],
source => $::project_config::nodepool_scripts_dir,
}
if ! defined(Class['project_config']) {
class { 'project_config':
url => $project_config_repo,
}
} }
} }