opendev/system-config
Code Issues Proposed changes

Merge "Also test puppet zuul on trusty"

Browse Source
This commit is contained in:
Jenkins 2015-02-14 00:16:05 +00:00 committed by Gerrit Code Review
commit 8bea6462c3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -482,6 +482,7 @@ node 'nodepool.openstack.org' {
}
# Node-OS: precise
# Node-OS: trusty
node 'zuul.openstack.org' {
class { 'openstack_project::zuul_prod':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
@ -524,6 +525,7 @@ node 'zuul.openstack.org' {
}
# Node-OS: precise
# Node-OS: trusty
node /^zm\d+\.openstack\.org$/ {
class { 'openstack_project::zuul_merger':
gearman_server => 'zuul.openstack.org',
@ -536,6 +538,7 @@ node /^zm\d+\.openstack\.org$/ {
}
# Node-OS: precise
# Node-OS: trusty
node 'zuul-dev.openstack.org' {
class { 'openstack_project::zuul_dev':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',