X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fppa.pp;fp=manifests%2Fppa.pp;h=accf0fc4bc53250f383f8d0a01a07115397c74d5;hb=fa827b740ee940cd8599f06c606568501cde15fc;hp=311f81df0e79d72b309e5edd303c00a4f63fbe3c;hpb=6fa24e6b09cf988b897b2b5dc9b911770c0c71b7;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 311f81d..accf0fc 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -55,7 +55,8 @@ define apt::ppa( $sources_list_d_filename = "${dash_filename_no_specialchars}-${release}.list" - if versioncmp($facts['os']['release']['full'], '15.10') >= 0 { + if versioncmp($facts['os']['release']['full'], '15.10') >= 0 and + versioncmp($facts['os']['release']['full'], '21.04') < 0 { $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg" } else { $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"