aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:23 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:23 +0000
commite14cedea84900b8de3e16dcb96abbd27d590085b (patch)
tree94a3970c54d8693d7c32198b72bb120c08af532a /deployment
parentf354bdaf4612d737a5243b9cc93f0fe9e6fc492c (diff)
downloadpuppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar.gz
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar.bz2
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar.xz
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.zip
buildsystem::var::distros: change $distros structure
The $distros variable is hash containing settings about the distributions. It was something like this : $distro = { 'cauldron' => { 'arch' => [ 'i586', 'x86_64' ], 'medias' => { 'core' => [ 'release' ], }, 'base_medias' => [ 'core/release' ], }, } It is now something like this : $distro = { 'cauldron' => { 'arch' => [ 'i586', 'x86_64' ], 'medias' => { 'core' => { 'repos' => { 'release' => {}, }, }, }, 'base_medias' => [ 'core/release' ], }, } This should allow setting more infos about each medias / repos, that can be used in order to generate media.cfg config files.
Diffstat (limited to 'deployment')
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp26
1 files changed, 21 insertions, 5 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 3526bf1e..66e64ac0 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -20,15 +20,31 @@ class mga_buildsystem::config {
}
$std_arch = ['i586', 'x86_64']
- $std_repos = ['release','updates_testing','backports_testing','backports','updates']
+ $std_repos = {
+ 'release' => {},
+ 'updates_testing' => {},
+ 'backports_testing' => {},
+ 'backports' => {},
+ 'updates' => {},
+ }
$std_medias = {
- 'core' => $std_repos,
- 'nonfree' => $std_repos,
- 'tainted' => $std_repos,
+ 'core' => {
+ 'repos' => $std_repos,
+ },
+ 'nonfree' => {
+ 'repos' => $std_repos,
+ },
+ 'tainted' => {
+ 'repos' => $std_repos,
+ },
}
$std_base_media = [ 'core/release', 'core/updates' ]
$infra_medias = {
- 'infra' => ['release'],
+ 'infra' => {
+ 'repos' => {
+ 'release' => {},
+ },
+ },
}
class { 'buildsystem::var::distros':
distros => {