From 031400567fcd25c5601c2046c1eceb4225926068 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 20 Jan 2016 21:37:08 +0000 Subject: [PATCH] Put wheel-mirror workers in a common group 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 --- manifests/site.pp | 1 + modules/openstack_project/files/puppetmaster/groups.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index e7ebee3282..53b9941c6a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1105,6 +1105,7 @@ node 'codesearch.openstack.org' { # Node-OS: trusty node /.*wheel-mirror-.*\.openstack\.org/ { + $group = 'wheel-mirror' include openstack_project class { 'openstack_project::wheel_mirror_slave': sysadmins => hiera('sysadmins', []), diff --git a/modules/openstack_project/files/puppetmaster/groups.txt b/modules/openstack_project/files/puppetmaster/groups.txt index 478366c155..cdba476c2e 100644 --- a/modules/openstack_project/files/puppetmaster/groups.txt +++ b/modules/openstack_project/files/puppetmaster/groups.txt @@ -9,4 +9,5 @@ zuul-merger ~zm\d+\.openstack\.org ci-backup ci-backup-*.openstack.org afsdb afsdb*.openstack.org afs afs*.*.openstack.org +wheel-mirror *wheel-mirror-*.openstack.org disabled ci-backup-rs-ord.openstack.org:jenkins-dev.openstack.org