summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-10-21 20:27:06 -0400
committerMicah Anderson <micah@leap.se>2014-10-21 20:27:06 -0400
commitb76445c07688ba1b4e8940189f8538a741de92d4 (patch)
treee5ead748e1c534039b6aeffdb127734f14d0b505
parent51a1e1c6db33ed2868ec74728f854237e3dfd86a (diff)
modify the leap repository contents so they pick the correct repository,
based on the hiera value 'major_version' (#6251) Change-Id: I10532ef83e3aa2d35d9c0be241952a35e366bba4
-rw-r--r--platform.rb2
-rw-r--r--puppet/modules/site_apt/manifests/leap_repo.pp5
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]
}