Merge pull request #1011 from Conzar/ppa-ubuntu-fix

Fixed reading conditions for gpg file for Ubuntu versions 21.04 and later.
puppetlabs · Feb 3, 2022 · 44b5124 · 44b5124
2 parents 6fa24e6 + fa827b7
commit 44b5124
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
@@ -55,7 +55,8 @@
 
   $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"