diff options
| author | Varac <varac@leap.se> | 2014-10-22 21:06:59 +0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@review.leap.se> | 2014-10-22 21:06:59 +0800 |
| commit | 6cb63095c172c7a31123b9b423da66beb9298cee (patch) | |
| tree | bf485121bca60d156803592b03256012383239ff | |
| parent | a936a12ca449a844174baad841332f2c5a9a2bff (diff) | |
| parent | b76445c07688ba1b4e8940189f8538a741de92d4 (diff) | |
Merge "modify the leap repository contents so they pick the correct repository, based on the hiera value 'major_version' (#6251)" into develop
| -rw-r--r-- | platform.rb | 2 | ||||
| -rw-r--r-- | puppet/modules/site_apt/manifests/leap_repo.pp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/platform.rb b/platform.rb index 35017559..06a49b7e 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ # Leap::Platform.define do - self.version = "0.5.4.1" + self.version = "0.6" self.compatible_cli = "1.6.0".."1.99" # 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] } |