X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=ad80977c68cda73576dbf30b30c06bcd00bbcd54;hb=aba776640b70ab8123d1d614dcc2892d5c42a408;hp=163a411bb21f426f1ae1f43aeeffc4cd4c188464;hpb=481846b030e9ea3783ed6ecdac47f1f9a370ccd8;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index 163a411..ad80977 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,31 +1,39 @@
 # source.pp
 # add an apt source
 define apt::source(
-  $location       = undef,
-  $comment        = $name,
-  $ensure         = present,
-  $release        = $::apt::xfacts['lsbdistcodename'],
-  $repos          = 'main',
-  $include        = {},
-  $key            = undef,
-  $pin            = false,
-  $architecture   = undef,
-  $allow_unsigned = false,
+  Optional[String] $location           = undef,
+  String $comment                      = $name,
+  String $ensure                       = present,
+  Optional[String] $release            = undef,
+  String $repos                        = 'main',
+  Optional[Variant[Hash]] $include     = {},
+  Optional[Variant[String, Hash]] $key = undef,
+  $pin                                 = undef,
+  Optional[String] $architecture       = undef,
+  Boolean $allow_unsigned              = false,
+  Boolean $notify_update               = true,
 ) {
-  validate_string($architecture, $comment, $location, $repos)
-  validate_bool($allow_unsigned)
-  validate_hash($include)
 
-  unless $release {
-    fail('lsbdistcodename fact not available: release parameter required')
+  # This is needed for compat with 1.8.x
+  include ::apt
+
+  $_before = Apt::Setting["list-${title}"]
+
+  if ! $release {
+    if $facts['lsbdistcodename'] {
+      $_release = $facts['lsbdistcodename']
+    } else {
+      fail('lsbdistcodename fact not available: release parameter required')
+    }
+  } else {
+    $_release = $release
   }
 
   if $ensure == 'present' and ! $location {
     fail('cannot create a source entry without specifying a location')
   }
 
-  $_before = Apt::Setting["list-${title}"]
-  $_include = merge($::apt::include_defaults, $include)
+  $includes = merge($::apt::include_defaults, $include)
 
   if $key {
     if is_hash($key) {
@@ -34,33 +42,51 @@ define apt::source(
       }
       $_key = merge($::apt::source_key_defaults, $key)
     } else {
-      validate_string($key)
-      $_key = $key
+      validate_legacy(String, 'validate_string', $key)
+      $_key = { 'id' => $key }
     }
   }
 
+  $header = epp('apt/_header.epp')
+
+  $sourcelist = epp('apt/source.list.epp', {
+    'comment'        => $comment,
+    'includes'       => $includes,
+    'architecture'   => $architecture,
+    'allow_unsigned' => $allow_unsigned,
+    'location'       => $location,
+    'release'        => $_release,
+    'repos'          => $repos,
+  })
+
   apt::setting { "list-${name}":
-    ensure  => $ensure,
-    content => template('apt/_header.erb', 'apt/source.list.erb'),
+    ensure        => $ensure,
+    content       => "${header}${sourcelist}",
+    notify_update => $notify_update,
   }
 
-  if ($pin != false) {
-    # Get the host portion out of the url so we can pin to origin
-    $url_split = split($location, '/')
-    $host      = $url_split[2]
-
-    apt::pin { $name:
-      ensure   => $ensure,
-      priority => $pin,
-      before   => $_before,
-      origin   => $host,
+  if $pin {
+    if is_hash($pin) {
+      $_pin = merge($pin, { 'ensure' => $ensure, 'before' => $_before })
+    } elsif (is_numeric($pin) or is_string($pin)) {
+      $url_split = split($location, '[:\/]+')
+      $host      = $url_split[1]
+      $_pin = {
+        'ensure'   => $ensure,
+        'priority' => $pin,
+        'before'   => $_before,
+        'origin'   => $host,
+      }
+    } else {
+      fail('Received invalid value for pin parameter')
     }
+    create_resources('apt::pin', { "${name}" => $_pin })
   }
 
   # We do not want to remove keys when the source is absent.
   if $key and ($ensure == 'present') {
     if is_hash($_key) {
-      apt::key { "Add key: ${_key['id']} from Apt::Source ${title}":
+      apt::key { "Add key: ${$_key['id']} from Apt::Source ${title}":
         ensure  => present,
         id      => $_key['id'],
         server  => $_key['server'],
@@ -69,12 +95,6 @@ define apt::source(
         options => $_key['options'],
         before  => $_before,
       }
-    } else {
-      apt::key { "Add key: ${_key} from Apt::Source ${title}":
-        ensure => present,
-        id     => $_key,
-        before => $_before,
-      }
     }
   }
 }