X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsetting.pp;h=91835cb1b2b88f15387b276660e50a26828bed91;hb=811bbd90db7b205c3f32f35ee3919e4564192af0;hp=cee854c9e8aecef48872035cf915e6e8dcaa215d;hpb=c1473996642fdbd45482045c2c331f306c33d2f9;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/setting.pp b/manifests/setting.pp
index cee854c..91835cb 100644
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -18,11 +18,15 @@ define apt::setting (
   $setting_type = $title_array[0]
   $base_name = join(delete_at($title_array, 0), '-')
 
-  validate_re($setting_type, ['\Aconf\z', '\Apref\z', '\Alist\z'], "apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
+  assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b| {
+    fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
+  }
 
-  unless is_integer($priority) {
+  if $priority !~ Integer {
     # need this to allow zero-padded priority.
-    validate_re($priority, '^\d+$', 'apt::setting priority must be an integer or a zero-padded integer')
+    assert_type(Pattern[/^\d+$/], $priority) |$a, $b| {
+      fail('apt::setting priority must be an integer or a zero-padded integer')
+    }
   }
 
   if ($setting_type == 'list') or ($setting_type == 'pref') {
@@ -49,14 +53,4 @@ define apt::setting (
     source  => $source,
     notify  => $_notify,
   }
-
-  case $::operatingsystem {
-    'Debian': {
-      if versioncmp($facts['os']['release']['full'], '9.0') >= 0 {
-        # require for adding apt GPG keys
-        ensure_packages(['dirmngr'])
-      }
-    }
-  }
-
 }