aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:11 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:11 +0000
commit941f7e3d093e802483ef615b4fa70a03bfc2bb30 (patch)
tree5a08a2664d123c2dda2a03035dbf13aff9c869dd /deployment
parent6622804070b891d186433ac35e8bdc86b57ae58d (diff)
downloadpuppet-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 'deployment')
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp6
1 files changed, 6 insertions, 0 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 4311856d..0a242ee1 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -25,6 +25,7 @@ class mga_buildsystem::config {
'nonfree' => $std_repos,
'tainted' => $std_repos,
}
+ $std_base_media = [ 'core/release', 'core/updates' ]
$infra_medias = {
'infra' => ['release'],
}
@@ -32,22 +33,27 @@ class mga_buildsystem::config {
distros => {
'cauldron' => {
'medias' => $std_medias,
+ 'base_media' => $std_base_media,
},
'1' => {
'medias' => $std_medias,
+ 'base_media' => $std_base_media,
},
'2' => {
'medias' => $std_medias,
+ 'base_media' => $std_base_media,
},
'infra_1' => {
'medias' => $infra_medias,
+ 'base_media' => $std_base_media,
},
'infra_2' => {
'medias' => $infra_medias,
+ 'base_media' => $std_base_media,
},
}
}