[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r233: Fixes to build slave chroot; pull in other modules for chroot.
Jeff Licquia
licquia at linuxfoundation.org
Mon Mar 12 17:23:43 UTC 2012
------------------------------------------------------------
revno: 233
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Mon 2012-03-12 13:23:43 -0400
message:
Fixes to build slave chroot; pull in other modules for chroot.
added:
modules/buildbot/files/chroot/modules@
modified:
modules/buildbot/manifests/slavechroot.pp
-------------- next part --------------
=== added symlink 'modules/buildbot/files/chroot/modules'
=== target is '../../..'
=== modified file 'modules/buildbot/manifests/slavechroot.pp'
--- a/modules/buildbot/manifests/slavechroot.pp 2012-03-12 16:59:19 +0000
+++ b/modules/buildbot/manifests/slavechroot.pp 2012-03-12 17:23:43 +0000
@@ -53,6 +53,15 @@
require => File['/etc/puppet-chroot/modules/buildbot/manifests'],
}
+ # Other modules. The way that works here: we link to the general
+ # modules directory, and pull in modules explicitly here.
+
+ file { '/etc/puppet-chroot/modules/user':
+ ensure => directory,
+ source => 'puppet:///modules/buildbot/chroot/modules/user',
+ recurse => true,
+ }
+
# For password information, we mock up a buildbotpw module as
# if from puppet-secrets, but we only include the appropriate
# user info.
@@ -90,13 +99,13 @@
# Actually apply the config to the chroot.
exec { 'puppet-update-smallword-chroot':
- command => "rsync -a /etc/puppet-chroot $smallwordchroot/tmp && ln -sf init_smallword.pp $smallwordchroot/tmp/puppet-chroot/modules/buildbotpw/manifests/init.pp && chroot $smallwordchroot puppet apply --modulepath=/tmp/puppet-chroot -e 'include buildbot::slave'",
+ command => "rsync -a /etc/puppet-chroot $smallwordchroot/tmp && ln -sf init_smallword.pp $smallwordchroot/tmp/puppet-chroot/modules/buildbotpw/manifests/init.pp && chroot $smallwordchroot puppet apply --modulepath=/tmp/puppet-chroot/modules -e 'include buildbot::slave'",
path => [ '/bin', '/sbin', '/usr/bin', '/usr/sbin' ],
logoutput => on_failure,
}
exec { 'puppet-update-bigword-chroot':
- command => "rsync -a /etc/puppet-chroot $bigwordchroot/tmp && ln -sf init_bigword.pp $bigwordchroot/tmp/puppet-chroot/modules/buildbotpw/manifests/init.pp && chroot $bigwordchroot puppet apply --modulepath=/tmp/puppet-chroot -e 'include buildbot::slave'",
+ command => "rsync -a /etc/puppet-chroot $bigwordchroot/tmp && ln -sf init_bigword.pp $bigwordchroot/tmp/puppet-chroot/modules/buildbotpw/manifests/init.pp && chroot $bigwordchroot puppet apply --modulepath=/tmp/puppet-chroot/modules -e 'include buildbot::slave'",
path => [ '/bin', '/sbin', '/usr/bin', '/usr/sbin' ],
logoutput => on_failure,
}
More information about the lsb-messages
mailing list