summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2014-10-22 21:06:59 +0800
committerGerrit Code Review <gerrit2@review.leap.se>2014-10-22 21:06:59 +0800
commit6cb63095c172c7a31123b9b423da66beb9298cee (patch)
treebf485121bca60d156803592b03256012383239ff /puppet/modules
parenta936a12ca449a844174baad841332f2c5a9a2bff (diff)
parentb76445c07688ba1b4e8940189f8538a741de92d4 (diff)
Merge "modify the leap repository contents so they pick the correct repository, based on the hiera value 'major_version' (#6251)" into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_apt/manifests/leap_repo.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 6b3d9919..2d4ba0e1 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -1,6 +1,9 @@
class site_apt::leap_repo {
+ $platform = hiera_hash('platform')
+ $major_version = $platform['major_version']
+
apt::sources_list { 'leap.list':
- content => 'deb http://deb.leap.se/debian stable main',
+ content => "deb http://deb.leap.se/${major_version} wheezy main\n",
before => Exec[refresh_apt]
}