Merge pull request #1039 from david22swan/GH-1036/main/dependency_cycle

(ISSUE-1036) Conditional `gnupg` include added to init.pp

diff --git a/manifests/init.pp b/manifests/init.pp
index 4aa4a68ccd4c70dd7d8a1267b2309caa8d09cdce..704311061b6df0e7f6d649c70721554e29d84ad1 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -358,4 +358,20 @@ class apt (
   if $pins {
     create_resources('apt::pin', $pins)
   }
+
+  case $facts['os']['name'] {
+    'Debian': {
+      if versioncmp($facts['os']['release']['major'], '9') >= 0 {
+        ensure_packages(['gnupg'])
+      }
+    }
+    'Ubuntu': {
+      if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
+        ensure_packages(['gnupg'])
+      }
+    }
+    default: {
+      # Nothing in here
+    }
+  }
 }