X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=0bb9b3be7161bd3929e12e08bcfa7d8b7fa715da;hb=0f9327bbf4c71f346a51eb554ba116f93ff26177;hp=f6647dfe76b1021e645871711d6a8e9a11b6af57;hpb=83ae566b084c88e2778ea0220c89a2ec07b7ba4e;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index f6647df..0bb9b3b 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -1,93 +1,158 @@
 # source.pp
 # add an apt source
-
 define apt::source(
+  $location          = undef,
   $comment           = $name,
   $ensure            = present,
-  $location          = '',
-  $release           = 'UNDEF',
+  $release           = undef,
   $repos             = 'main',
-  $include_src       = true,
-  $include_deb       = true,
-  $required_packages = false,
+  $include           = {},
   $key               = undef,
-  $key_server        = 'keyserver.ubuntu.com',
+  $pin               = undef,
+  $architecture      = undef,
+  $allow_unsigned    = false,
+  $include_src       = undef,
+  $include_deb       = undef,
+  $required_packages = undef,
+  $key_server        = undef,
   $key_content       = undef,
   $key_source        = undef,
-  $pin               = false,
-  $architecture      = undef,
-  $trusted_source    = false,
+  $trusted_source    = undef,
+  $notify_update     = undef,
 ) {
+  validate_string($architecture, $comment, $location, $repos)
+  validate_bool($allow_unsigned)
+  validate_hash($include)
+
+  # This is needed for compat with 1.8.x
+  include ::apt
+
+  $_before = Apt::Setting["list-${title}"]
+
+  if $include_src != undef {
+    warning("\$include_src is deprecated and will be removed in the next major release, please use \$include => { 'src' => ${include_src} } instead")
+  }
+
+  if $include_deb != undef {
+    warning("\$include_deb is deprecated and will be removed in the next major release, please use \$include => { 'deb' => ${include_deb} } instead")
+  }
+
+  if $required_packages != undef {
+    warning('$required_packages is deprecated and will be removed in the next major release, please use package resources instead.')
+    exec { "Required packages: '${required_packages}' for ${name}":
+      command     => "${::apt::params::provider} -y install ${required_packages}",
+      logoutput   => 'on_failure',
+      refreshonly => true,
+      tries       => 3,
+      try_sleep   => 1,
+      before      => $_before,
+    }
+  }
 
-  include apt::params
-  include apt::update
+  if $key_server != undef {
+    warning("\$key_server is deprecated and will be removed in the next major release, please use \$key => { 'server' => ${key_server} } instead.")
+  }
+
+  if $key_content != undef {
+    warning("\$key_content is deprecated and will be removed in the next major release, please use \$key => { 'content' => ${key_content} } instead.")
+  }
 
-  validate_string($architecture)
-  validate_bool($trusted_source)
+  if $key_source != undef {
+    warning("\$key_source is deprecated and will be removed in the next major release, please use \$key => { 'source' => ${key_source} } instead.")
+  }
 
-  $sources_list_d = $apt::params::sources_list_d
-  $provider       = $apt::params::provider
+  if $trusted_source != undef {
+    warning('$trusted_source is deprecated and will be removed in the next major release, please use $allow_unsigned instead.')
+    $_allow_unsigned = $trusted_source
+  } else {
+    $_allow_unsigned = $allow_unsigned
+  }
 
-  if $release == 'UNDEF' {
-    if $::lsbdistcodename == undef {
+  if ! $release {
+    $_release = $::apt::params::xfacts['lsbdistcodename']
+    unless $_release {
       fail('lsbdistcodename fact not available: release parameter required')
-    } else {
-      $release_real = $::lsbdistcodename
     }
   } else {
-    $release_real = $release
+    $_release = $release
+  }
+
+  if $ensure == 'present' and ! $location {
+    fail('cannot create a source entry without specifying a location')
   }
 
-  file { "${name}.list":
-    ensure  => $ensure,
-    path    => "${sources_list_d}/${name}.list",
-    owner   => root,
-    group   => root,
-    mode    => '0644',
-    content => template('apt/_header.erb', 'apt/source.list.erb'),
-    notify  => Exec['apt_update'],
+  if $include_src != undef and $include_deb != undef {
+    $_deprecated_include = {
+      'src' => $include_src,
+      'deb' => $include_deb,
+    }
+  } elsif $include_src != undef {
+    $_deprecated_include = { 'src' => $include_src }
+  } elsif $include_deb != undef {
+    $_deprecated_include = { 'deb' => $include_deb }
+  } else {
+    $_deprecated_include = {}
   }
 
+  $_include = merge($::apt::params::include_defaults, $_deprecated_include, $include)
 
-  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]
+  $_deprecated_key = {
+    'key_server'  => $key_server,
+    'key_content' => $key_content,
+    'key_source'  => $key_source,
+  }
 
-    apt::pin { $name:
-      ensure   => $ensure,
-      priority => $pin,
-      before   => File["${name}.list"],
-      origin   => $host,
+  if $key {
+    if is_hash($key) {
+      unless $key['id'] {
+        fail('key hash must contain at least an id entry')
+      }
+      $_key = merge($::apt::params::source_key_defaults, $_deprecated_key, $key)
+    } else {
+      validate_string($key)
+      $_key = merge( { 'id' => $key }, $_deprecated_key)
     }
   }
 
-  if ($required_packages != false) and ($ensure == 'present') {
-    exec { "Required packages: '${required_packages}' for ${name}":
-      command     => "${provider} -y install ${required_packages}",
-      logoutput   => 'on_failure',
-      refreshonly => true,
-      tries       => 3,
-      try_sleep   => 1,
-      subscribe   => File["${name}.list"],
-      before      => Exec['apt_update'],
+  apt::setting { "list-${name}":
+    ensure        => $ensure,
+    content       => template('apt/_header.erb', 'apt/source.list.erb'),
+    notify_update => $notify_update,
+  }
+
+  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 })
   }
 
   # 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      => File["${name}.list"],
+    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'],
+        key_server  => $_key['key_server'],
+        key_content => $_key['key_content'],
+        key_source  => $_key['key_source'],
+        before      => $_before,
+      }
     }
   }
-
-  # Need anchor to provide containment for dependencies.
-  anchor { "apt::source::${name}":
-    require => Class['apt::update'],
-  }
 }