opendev/system-config
Code Issues Proposed changes

Also test puppet zuul on trusty

Browse Source 
People are starting to move from precise to trusty, and the module
is supposed to support both now.

Change-Id: I9bf92d799a1460b61e8abb853a79707dd502ee52
Depends-On: I70d814a5eaefea5a3fb6a47bc215f4ab64be884f
This commit is contained in:
James E. Blair 2015-02-13 15:35:48 -08:00
parent 1fd0831335
commit 72eb1acc13
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',