aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/manifests
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-05-27 17:44:40 +0000
committerThomas Backlund <tmb@mageia.org>2012-05-27 17:44:40 +0000
commit1f22ceb00c64a376d75c1e71c565cad236c9c9fa (patch)
tree4acbbea13f07ee9e99e7c378892359633aa31833 /modules/buildsystem/manifests
parent2f228a54d0e9c22a0b98c9f50cfc6b16d90120a1 (diff)
downloadpuppet-1f22ceb00c64a376d75c1e71c565cad236c9c9fa.tar
puppet-1f22ceb00c64a376d75c1e71c565cad236c9c9fa.tar.gz
puppet-1f22ceb00c64a376d75c1e71c565cad236c9c9fa.tar.bz2
puppet-1f22ceb00c64a376d75c1e71c565cad236c9c9fa.tar.xz
puppet-1f22ceb00c64a376d75c1e71c565cad236c9c9fa.zip
buildsystem: add support for mga 2
Diffstat (limited to 'modules/buildsystem/manifests')
-rw-r--r--modules/buildsystem/manifests/config.pp2
-rw-r--r--modules/buildsystem/manifests/iurt.pp2
-rw-r--r--modules/buildsystem/manifests/mgarepo.pp5
3 files changed, 7 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/config.pp b/modules/buildsystem/manifests/config.pp
index 0fa25279..b038da21 100644
--- a/modules/buildsystem/manifests/config.pp
+++ b/modules/buildsystem/manifests/config.pp
@@ -1,7 +1,7 @@
class buildsystem::config(
architectures = ['i586', 'x86_64'],
dev_distros = ['cauldron'],
- stable_distros = ['1'],
+ stable_distros = ['1', '2'],
distrosections = ['core', 'nonfree', 'tainted'],
sectionsrepos = ['release', 'updates', 'updates_testing', 'backports',
'backports_testing']
diff --git a/modules/buildsystem/manifests/iurt.pp b/modules/buildsystem/manifests/iurt.pp
index 6c26e867..a8e01348 100644
--- a/modules/buildsystem/manifests/iurt.pp
+++ b/modules/buildsystem/manifests/iurt.pp
@@ -19,7 +19,7 @@ class buildsystem::iurt {
ensure => directory,
}
- buildsystem::iurt::config { ['1','cauldron','mandriva2010.1','infra_1']: }
+ buildsystem::iurt::config { ['2','1','cauldron','mandriva2010.1','infra_1']: }
sudo::sudoers_config { 'iurt':
content => template('buildsystem/iurt/sudoers.iurt')
diff --git a/modules/buildsystem/manifests/mgarepo.pp b/modules/buildsystem/manifests/mgarepo.pp
index 86eaedd7..4520d49a 100644
--- a/modules/buildsystem/manifests/mgarepo.pp
+++ b/modules/buildsystem/manifests/mgarepo.pp
@@ -43,6 +43,11 @@ class buildsystem::mgarepo {
'nonfree' => ['release','updates_testing','backports_testing','backports','updates'],
'tainted' => ['release','updates_testing','backports_testing','backports','updates'],
},
+ '2' => {
+ 'core' => ['release','updates_testing','backports_testing','backports','updates'],
+ 'nonfree' => ['release','updates_testing','backports_testing','backports','updates'],
+ 'tainted' => ['release','updates_testing','backports_testing','backports','updates'],
+ },
'infra_1' => {
'infra' => ['release']
},