[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r427: Set users/passwords for new PPC builders.
Jeff Licquia
licquia at linuxfoundation.org
Tue Apr 9 15:15:53 UTC 2013
------------------------------------------------------------
revno: 427
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Tue 2013-04-09 11:15:53 -0400
message:
Set users/passwords for new PPC builders.
modified:
modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp 2013-04-09 14:40:22 +0000
+++ b/modules/buildbot/manifests/slave.pp 2013-04-09 15:15:53 +0000
@@ -17,18 +17,22 @@
include buildbotpw
- $masteruser = $architecture ? {
- /^i386$/ => 'lfbuild-x86',
- /^x86_64$/ => 'lfbuild-x86_64',
- /^ia64$/ => 'lfbuild-ia64',
- default => $buildbotpw::masteruser,
+ $masteruser = "${architecture}-${wordsize}" ? {
+ /^i386/ => 'lfbuild-x86',
+ /^x86_64/ => 'lfbuild-x86_64',
+ /^ia64/ => 'lfbuild-ia64',
+ /^ppc64-small$/ => 'lfbuild-ppc32',
+ /^ppc64-big$/ => 'lfbuild-ppc64',
+ default => $buildbotpw::masteruser,
}
- $masterpw = $architecture ? {
- /^i386$/ => $buildbotpw::x86password,
- /^x86_64$/ => $buildbotpw::x64password,
- /^ia64$/ => $buildbotpw::ia64password,
- default => $buildbotpw::masterpw,
+ $masterpw = "${architecture}-${wordsize}" ? {
+ /^i386/ => $buildbotpw::x86password,
+ /^x86_64/ => $buildbotpw::x64password,
+ /^ia64/ => $buildbotpw::ia64password,
+ /^ppc64-small$/ => $buildbotpw::ppc32password,
+ /^ppc64-big$/ => $buildbotpw::ppc64password,
+ default => $buildbotpw::masterpw,
}
# 32-bit versions of some architectures don't exist as
More information about the lsb-messages
mailing list