X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsetting.pp;h=a3fc3630bd5b6e3f4a1f0c9c40ae1c621217d60b;hb=refs%2Fheads%2Frelease-prep;hp=4729295d0d3e4fe84bef7667d1caa2bbf3c0108b;hpb=ba65bec7a04384430423c48dfe59828319bb8f08;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/setting.pp b/manifests/setting.pp
index 4729295..a3fc363 100644
--- a/manifests/setting.pp
+++ b/manifests/setting.pp
@@ -21,18 +21,17 @@
 #
 define apt::setting (
   Variant[String, Integer, Array] $priority           = 50,
-  Optional[Enum['file', 'present', 'absent']] $ensure = file,
+  Enum['file', 'present', 'absent'] $ensure           = file,
   Optional[String] $source                            = undef,
   Optional[String] $content                           = undef,
   Boolean $notify_update                              = true,
 ) {
-
   if $content and $source {
-    fail(translate('apt::setting cannot have both content and source'))
+    fail('apt::setting cannot have both content and source')
   }
 
   if !$content and !$source {
-    fail(translate('apt::setting needs either of content or source'))
+    fail('apt::setting needs either of content or source')
   }
 
   $title_array = split($title, '-')
@@ -40,13 +39,13 @@ define apt::setting (
   $base_name = join(delete_at($title_array, 0), '-')
 
   assert_type(Pattern[/\Aconf\z/, /\Apref\z/, /\Alist\z/], $setting_type) |$a, $b| {
-    fail(translate("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'"))
+    fail("apt::setting resource name/title must start with either 'conf-', 'pref-' or 'list-'")
   }
 
   if $priority !~ Integer {
     # need this to allow zero-padded priority.
     assert_type(Pattern[/^\d+$/], $priority) |$a, $b| {
-      fail(translate('apt::setting priority must be an integer or a zero-padded integer'))
+      fail('apt::setting priority must be an integer or a zero-padded integer')
     }
   }
 
@@ -56,8 +55,8 @@ define apt::setting (
     $_priority = $priority
   }
 
-  $_path = $::apt::config_files[$setting_type]['path']
-  $_ext  = $::apt::config_files[$setting_type]['ext']
+  $_path = $apt::config_files[$setting_type]['path']
+  $_ext  = $apt::config_files[$setting_type]['ext']
 
   if $notify_update {
     $_notify = Class['apt::update']
@@ -69,7 +68,6 @@ define apt::setting (
     ensure  => $ensure,
     owner   => 'root',
     group   => 'root',
-    mode    => '0644',
     content => $content,
     source  => $source,
     notify  => $_notify,