opendev/system-config
Code Issues Proposed changes

Add nodepool hiera group

Browse Source 
Also sort the groups.

Change-Id: I6c8718894c065549d5dfb37dae26a9c157c9cb09
This commit is contained in:
James E. Blair 2016-11-23 11:27:16 -08:00
parent ec6494a874
commit f5d625ac6b
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -786,6 +786,7 @@ node 'status.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'nodepool.openstack.org' { node 'nodepool.openstack.org' {
$group = 'nodepool'
# TODO(pabelanger): Move all of this back into nodepool manifest, it has # TODO(pabelanger): Move all of this back into nodepool manifest, it has
# grown too big. # grown too big.
$bluebox_username = hiera('nodepool_bluebox_username', 'username') $bluebox_username = hiera('nodepool_bluebox_username', 'username')
@ -886,6 +887,7 @@ node 'nodepool.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
# Node-OS: xenial # Node-OS: xenial
node /^nb\d+\.openstack\.org$/ { node /^nb\d+\.openstack\.org$/ {
$group = 'nodepool'
# TODO(pabelanger): Move all of this back into nodepool manifest, it has # TODO(pabelanger): Move all of this back into nodepool manifest, it has
# grown too big. # grown too big.
$bluebox_username = hiera('nodepool_bluebox_username', 'username') $bluebox_username = hiera('nodepool_bluebox_username', 'username')

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

@ -1,17 +1,18 @@
logstash-worker ~logstash-worker\d+\.openstack\.org afs afs*.*.openstack.org
subunit-worker ~subunit-worker\d+\.openstack\.org afsadmin mirror-update.openstack.org:release.slave.openstack.org
afsdb afsdb*.openstack.org
cacti ~cacti\d+\.openstack\.org
ci-backup ci-backup-*.openstack.org
disabled ci-backup-rs-ord.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org
elasticsearch ~elasticsearch0[1-7]\.openstack\.org elasticsearch ~elasticsearch0[1-7]\.openstack\.org
git-loadbalancer ~git(-fe\d+)?\.openstack\.org git-loadbalancer ~git(-fe\d+)?\.openstack\.org
git-server ~git\d+\.openstack\.org git-server ~git\d+\.openstack\.org
zuul-merger ~z[lm](static)?\d+\.openstack\.org logstash-worker ~logstash-worker\d+\.openstack\.org
cacti ~cacti\d+\.openstack\.org nodepool nodepool*.openstack.org:nb*.openstack.org
ci-backup ci-backup-*.openstack.org
afsdb afsdb*.openstack.org
afs afs*.*.openstack.org
wheel-mirror *wheel-mirror-*.openstack.org
afsadmin mirror-update.openstack.org:release.slave.openstack.org
signing signing*.ci.openstack.org signing signing*.ci.openstack.org
subunit-worker ~subunit-worker\d+\.openstack\.org
translate-dev ~translate-dev\d*\.openstack\.org
wheel-mirror *wheel-mirror-*.openstack.org
wiki ~wiki\d+\.openstack\.org wiki ~wiki\d+\.openstack\.org
wiki-dev ~wiki-dev\d+\.openstack\.org wiki-dev ~wiki-dev\d+\.openstack\.org
translate-dev ~translate-dev\d*\.openstack\.org zuul-merger ~z[lm](static)?\d+\.openstack\.org
disabled ci-backup-rs-ord.openstack.org:ask-staging.openstack.org:db368fcd-e61a-4294-a5cb-851c16650f7a:wiki.openstack.org