diff options
author | varac <varacanero@zeromail.org> | 2015-12-10 12:30:52 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2015-12-10 12:30:52 +0100 |
commit | 1f9da0490a3d55831e2b834ab5801c629123d226 (patch) | |
tree | aef163ed0a947aeb63e29f30e0a3a75efaf3bace /puppet/modules/site_apt/manifests/leap_repo.pp | |
parent | efed34739df6cafbb5f5e8144aa98a87d96d6924 (diff) |
[bug] Configure default sources.platform.apt.basic
Providing a custom sources.platform.apt.basic value worked
with the last commit, but without that the platform would fail.
So we provide a default value now in provider_base/common.json,
which can get overridden.
Diffstat (limited to 'puppet/modules/site_apt/manifests/leap_repo.pp')
-rw-r--r-- | puppet/modules/site_apt/manifests/leap_repo.pp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp index 317c2f12..a1382374 100644 --- a/puppet/modules/site_apt/manifests/leap_repo.pp +++ b/puppet/modules/site_apt/manifests/leap_repo.pp @@ -4,14 +4,8 @@ class site_apt::leap_repo { $platform = hiera_hash('platform') $major_version = $platform['major_version'] - if $::site_apt::apt_url_leap_basic == '' { - $content = "deb http://deb.leap.se/${major_version} ${::lsbdistcodename} main\n" - } else { - $content = "deb ${::site_apt::apt_url_leap_basic} ${::lsbdistcodename} main\n" - } - apt::sources_list { 'leap.list': - content => $content, + content => "deb ${::site_apt::apt_url_platform_basic} ${::lsbdistcodename} main\n", before => Exec[refresh_apt] } |