opendev/system-config
Code Issues Proposed changes

Create afs-admin hiera group

Browse Source 
For mirror-update and release.slave, both of which need the
afsadmin keytab.

Change-Id: I1aade3d383ccdbe244ae523838a93bf24410495e
This commit is contained in:
James E. Blair 2016-02-04 08:58:30 -08:00
parent 825d2f287c
commit e40954a97f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -528,6 +528,8 @@ node /^git\d+\.openstack\.org$/ {
# A machine to drive AFS mirror updates. # A machine to drive AFS mirror updates.
# Node-OS: trusty # Node-OS: trusty
node 'mirror-update.openstack.org' { node 'mirror-update.openstack.org' {
$group = "afsadmin"
class { 'openstack_project::mirror_update': class { 'openstack_project::mirror_update':
bandersnatch_keytab => hiera('bandersnatch_keytab'), bandersnatch_keytab => hiera('bandersnatch_keytab'),
admin_keytab => hiera('afsadmin_keytab'), admin_keytab => hiera('afsadmin_keytab'),
@ -881,6 +883,8 @@ node 'proposal.slave.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'release.slave.openstack.org' { node 'release.slave.openstack.org' {
$group = "afsadmin"
include openstack_project include openstack_project
class { 'openstack_project::release_slave': class { 'openstack_project::release_slave':
pypi_username => 'openstackci', pypi_username => 'openstackci',

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

@ -10,4 +10,5 @@ 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 wheel-mirror *wheel-mirror-*.openstack.org
afs-admin mirror-update.openstack.org:release.slave.openstack.org
disabled ci-backup-rs-ord.openstack.org:jenkins-dev.openstack.org:ask-staging.openstack.org disabled ci-backup-rs-ord.openstack.org:jenkins-dev.openstack.org:ask-staging.openstack.org