X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=f6647dfe76b1021e645871711d6a8e9a11b6af57;hb=396e11af3a0ee7d0b5820a136bdb17f2ea4bf41b;hp=2bd2e42d5a0817973ecc1923eccfba7603b24024;hpb=3abad192fad6079f7e94d5be06a1ac02806ee707;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index 2bd2e42..f6647df 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -2,58 +2,92 @@
 # add an apt source
 
 define apt::source(
-  $location = '',
-  $release = 'karmic',
-  $repos = 'main',
-  $include_src = true,
+  $comment           = $name,
+  $ensure            = present,
+  $location          = '',
+  $release           = 'UNDEF',
+  $repos             = 'main',
+  $include_src       = true,
+  $include_deb       = true,
   $required_packages = false,
-  $key = false,
-  $key_server = 'keyserver.ubuntu.com',
-  $pin = false,
-  $key_content = false
+  $key               = undef,
+  $key_server        = 'keyserver.ubuntu.com',
+  $key_content       = undef,
+  $key_source        = undef,
+  $pin               = false,
+  $architecture      = undef,
+  $trusted_source    = false,
 ) {
 
   include apt::params
+  include apt::update
 
-  file { "${name}.list":
-    path => "${apt::params::root}/sources.list.d/${name}.list",
-    ensure => file,
-    owner => root,
-    group => root,
-    mode => 644,
-    content => template("apt/source.list.erb"),
+  validate_string($architecture)
+  validate_bool($trusted_source)
+
+  $sources_list_d = $apt::params::sources_list_d
+  $provider       = $apt::params::provider
 
+  if $release == 'UNDEF' {
+    if $::lsbdistcodename == undef {
+      fail('lsbdistcodename fact not available: release parameter required')
+    } else {
+      $release_real = $::lsbdistcodename
+    }
+  } else {
+    $release_real = $release
   }
 
-  if $pin != false {
-    apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+  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'],
   }
 
-  exec { "${name} apt update":
-    command => "${apt::params::provider} update",
-    subscribe => File["${name}.list"],
-    refreshonly => true,
+
+  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   => File["${name}.list"],
+      origin   => $host,
+    }
   }
 
-  if $required_packages != false {
-    exec { "${apt::params::provider} -y install ${required_packages}":
-      subscribe => File["${name}.list"],
+  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'],
     }
   }
 
-  if $key != false {
-    if $key_content {
-      exec { "Add key: ${key} from content":
-        command => "/bin/echo '${key_content}' | /usr/bin/apt-key add -",
-        unless => "/usr/bin/apt-key list | /bin/grep '${key}'",
-        before => File["${name}.list"],
-      }
-    } else {
-      exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-        unless => "/usr/bin/apt-key list | /bin/grep ${key}",
-        before => File["${name}.list"],
-      }
+  # 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"],
     }
   }
+
+  # Need anchor to provide containment for dependencies.
+  anchor { "apt::source::${name}":
+    require => Class['apt::update'],
+  }
 }