From 1f9da0490a3d55831e2b834ab5801c629123d226 Mon Sep 17 00:00:00 2001 From: varac Date: Thu, 10 Dec 2015 12:30:52 +0100 Subject: [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. --- puppet/modules/site_apt/manifests/leap_repo.pp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'puppet/modules/site_apt/manifests/leap_repo.pp') 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] } -- cgit v1.2.3