X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=40fc015bb6e8a194038d50e1f7444cb0bfc965b8;hb=33c296b963a433c6fe5584b0fd1148c7330c69d0;hp=e4e4aa3dea1c08e71b834f4019d1342a28c8a1fe;hpb=351c8d5941f6bd02304df6b4185dea8c8104aefa;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index e4e4aa3..40fc015 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,63 +1,85 @@
 # source.pp
 # add an apt source
 define apt::source(
-  $comment           = $name,
-  $ensure            = present,
-  $location          = '',
-  $release           = $::lsbdistcodename,
-  $repos             = 'main',
-  $include_src       = false,
-  $include_deb       = true,
-  $key               = undef,
-  $key_server        = 'keyserver.ubuntu.com',
-  $key_content       = undef,
-  $key_source        = undef,
-  $pin               = false,
-  $architecture      = undef,
-  $trusted_source    = false,
+  $location       = undef,
+  $comment        = $name,
+  $ensure         = present,
+  $release        = $::apt::xfacts['lsbdistcodename'],
+  $repos          = 'main',
+  $include        = {},
+  $key            = undef,
+  $pin            = undef,
+  $architecture   = undef,
+  $allow_unsigned = false,
 ) {
-  validate_string($architecture, $comment, $location, $release, $repos, $key_server)
-  validate_bool($trusted_source, $include_src, $include_deb)
+  validate_string($architecture, $comment, $location, $repos)
+  validate_bool($allow_unsigned)
+  validate_hash($include)
 
-  if ! $release {
+  unless $release {
     fail('lsbdistcodename fact not available: release parameter required')
   }
 
-  apt::setting { "list-${name}":
-    ensure       => $ensure,
-    base_name    => $name,
-    setting_type => 'list',
-    content      => template('apt/_header.erb', 'apt/source.list.erb'),
-    notify       => Exec['apt_update'],
+  if $ensure == 'present' and ! $location {
+    fail('cannot create a source entry without specifying a location')
   }
 
-  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]
+  $_before = Apt::Setting["list-${title}"]
+  $_include = merge($::apt::include_defaults, $include)
 
-    apt::pin { $name:
-      ensure   => $ensure,
-      priority => $pin,
-      before   => Apt::Setting["list-${name}"],
-      origin   => $host,
+  if $key {
+    if is_hash($key) {
+      unless $key['id'] {
+        fail('key hash must contain at least an id entry')
+      }
+      $_key = merge($::apt::source_key_defaults, $key)
+    } else {
+      validate_string($key)
+      $_key = $key
     }
   }
 
-  # We do not want to remove keys when the source is absent.
-  if $key and ($ensure == 'present') {
-    apt::key { "Add key: ${key} from Apt::Source ${title}":
-      ensure      => present,
-      key         => $key,
-      key_server  => $key_server,
-      key_content => $key_content,
-      key_source  => $key_source,
-      before      => Apt::Setting["list-${name}"],
+  apt::setting { "list-${name}":
+    ensure  => $ensure,
+    content => template('apt/_header.erb', 'apt/source.list.erb'),
+  }
+
+  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[2]
+      $_pin = {
+        'ensure'   => $ensure,
+        'priority' => $pin,
+        'before'   => $_before,
+        'origin'   => $host,
+      }
+    } else {
+      fail('Received invalid value for pin parameter')
     }
+    create_resources('apt::pin', { "${name}" => $_pin })
   }
 
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::source::${name}":
-    require => Class['apt::update'],
+  # 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}":
+        ensure  => present,
+        id      => $_key['id'],
+        server  => $_key['server'],
+        content => $_key['content'],
+        source  => $_key['source'],
+        options => $_key['options'],
+        before  => $_before,
+      }
+    } else {
+      apt::key { "Add key: ${_key} from Apt::Source ${title}":
+        ensure => present,
+        id     => $_key,
+        before => $_before,
+      }
+    }
   }
 }