X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Finit.pp;h=aa61986d21fdc992b3b3cecf85c898f6ea35a7f1;hb=ecb9bfe4edcb4c285c8c86e39ff047641b814b8e;hp=44e66ce51ff2dd00980603ae05423c11d092cae3;hpb=0fd497d58b47e48f830a8fcea49e37d8df65930b;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/init.pp b/manifests/init.pp
index 44e66ce..aa61986 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -35,10 +35,11 @@ class apt (
     fail('This module only works on Debian or derivatives like Ubuntu')
   }
 
-  $frequency_options = ['always','daily','weekly','reluctantly']
-
   if $update['frequency'] {
-    validate_re($update['frequency'], $frequency_options)
+    assert_type(
+      Enum['always','daily','weekly','reluctantly'],
+      $update['frequency'],
+    )
   }
   if $update['timeout'] {
     assert_type(Integer, $update['timeout'])
@@ -66,7 +67,7 @@ class apt (
   $_purge = merge($::apt::purge_defaults, $purge)
 
   if $proxy['ensure'] {
-    validate_re($proxy['ensure'], ['file', 'present', 'absent'])
+    assert_type(Enum['file', 'present', 'absent'], $proxy['ensure'])
   }
   if $proxy['host'] {
     assert_type(String, $proxy['host'])
@@ -77,6 +78,9 @@ class apt (
   if $proxy['https']{
     assert_type(Boolean, $proxy['https'])
   }
+  if $proxy['direct']{
+    assert_type(Boolean, $proxy['direct'])
+  }
 
   $_proxy = merge($apt::proxy_defaults, $proxy)
 
@@ -182,7 +186,7 @@ class apt (
   # required for adding GPG keys on Debian 9 (and derivatives)
   case $facts['os']['name'] {
     'Debian': {
-      if versioncmp($facts['os']['release']['full'], '9.0') >= 0 {
+      if versioncmp($facts['os']['release']['major'], '9') >= 0 {
         ensure_packages(['dirmngr'])
       }
     }