diff options
author | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:11 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-23 15:05:11 +0000 |
commit | 941f7e3d093e802483ef615b4fa70a03bfc2bb30 (patch) | |
tree | 5a08a2664d123c2dda2a03035dbf13aff9c869dd /modules/buildsystem/manifests | |
parent | 6622804070b891d186433ac35e8bdc86b57ae58d (diff) | |
download | puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar.gz puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar.bz2 puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.tar.xz puppet-941f7e3d093e802483ef615b4fa70a03bfc2bb30.zip |
buildsystem: use common iurt config file for all distros
All distributions now use the same template file for their iurt
configuration file. The 'base_media' value has been added in the
distributions configuration in buildsystem::var::distros to allow
setting in iurt configuration the base_media that will be used to
generate chroots.
The iurt configuration now also contains all the medias in 'all_media',
instead of only the 'release' medias previously.
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r-- | modules/buildsystem/manifests/iurt/config.pp | 2 | ||||
-rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/buildsystem/manifests/iurt/config.pp b/modules/buildsystem/manifests/iurt/config.pp index 1d75c32e..1a86a9e4 100644 --- a/modules/buildsystem/manifests/iurt/config.pp +++ b/modules/buildsystem/manifests/iurt/config.pp @@ -7,6 +7,6 @@ define buildsystem::iurt::config() { file { "/etc/iurt/build/$distribution.conf": owner => $build_login, group => $build_login, - content => template("buildsystem/iurt/$distribution.conf") + content => template("buildsystem/iurt.conf") } } diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 41c6df40..58f63417 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -3,6 +3,8 @@ # distribution name. Each distribution is itself an hash containing # the following keys: # - medias: an hash containing the different medias / repositories +# - base_media: a list of medias that will be used by iurt to build +# the chroots class buildsystem::var::distros( $distros ) { } |