X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fparams.pp;h=ef9904df87a5c5d2b1899dd5220ad8a6a93277d1;hb=044fb5faf545f1336c949bd5667da3d5dda2fa1f;hp=6f7e5f9dc04dbc7d83f2a539ee9ffc7a428b92f7;hpb=37043dff8572f490fcb77317784d042d1f7a4c70;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/params.pp b/manifests/params.pp index 6f7e5f9..ef9904d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -122,24 +122,28 @@ class apt::params { 'debian': { case $distcodename { 'squeeze': { - $backports = {'location' => 'http://backports.debian.org/debian-backports', - 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', - 'repos' => 'main contrib non-free', + $backports = { + 'location' => 'http://backports.debian.org/debian-backports', + 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', + 'repos' => 'main contrib non-free', } } default: { - $backports = {'location' => 'http://ftp.debian.org/debian/', - 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD624692555', - 'repos' => 'main contrib non-free', + $backports = { + 'location' => 'http://ftp.debian.org/debian/', + 'key' => 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553', + 'repos' => 'main contrib non-free', } } } } 'ubuntu': { - $backports = {'location' => 'http://archive.ubuntu.com/ubuntu', - 'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5', - 'repos' => 'main universe multiverse restricted', + $backports = { + 'location' => 'http://archive.ubuntu.com/ubuntu', + 'key' => '630239CC130E1A7FD81A27B140976EAF437D05B5', + 'repos' => 'main universe multiverse restricted', } + case $distcodename { 'lucid': { $ppa_options = undef @@ -162,6 +166,7 @@ class apt::params { '', default: { $ppa_options = undef $ppa_package = undef + $backports = undef } } }