opendev/system-config
Code Issues Proposed changes

Put wheel-mirror workers in a common group

Browse Source 
The wheel-mirror workers share a common set of hiera keys, and so
keeping them in a group together reduces significant duplication in
our hiera files.

Change-Id: I67b717943eb19404c87b2a3b571f681a0a15b7b4
This commit is contained in:
Jeremy Stanley 2016-01-20 21:37:08 +00:00
parent dabf00782c
commit 031400567f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -1105,6 +1105,7 @@ node 'codesearch.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node /.*wheel-mirror-.*\.openstack\.org/ { node /.*wheel-mirror-.*\.openstack\.org/ {
$group = 'wheel-mirror'
include openstack_project include openstack_project
class { 'openstack_project::wheel_mirror_slave': class { 'openstack_project::wheel_mirror_slave':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),

1
modules/openstack_project/files/puppetmaster/groups.txt
View File

@ -9,4 +9,5 @@ zuul-merger ~zm\d+\.openstack\.org
ci-backup ci-backup-*.openstack.org ci-backup ci-backup-*.openstack.org
afsdb afsdb*.openstack.org afsdb afsdb*.openstack.org
afs afs*.*.openstack.org afs afs*.*.openstack.org
wheel-mirror *wheel-mirror-*.openstack.org
disabled ci-backup-rs-ord.openstack.org:jenkins-dev.openstack.org disabled ci-backup-rs-ord.openstack.org:jenkins-dev.openstack.org