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

diff --git a/manifests/source.pp b/manifests/source.pp
index 2bd2e42..42a21e9 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -3,18 +3,23 @@
 
 define apt::source(
   $location = '',
-  $release = 'karmic',
+  $release = $lsbdistcodename,
   $repos = 'main',
   $include_src = true,
   $required_packages = false,
   $key = false,
   $key_server = 'keyserver.ubuntu.com',
-  $pin = false,
-  $key_content = false
+  $key_content = false,
+  $key_source  = false,
+  $pin = false
 ) {
 
   include apt::params
 
+  if $release == undef {
+    fail("lsbdistcodename fact not available: release parameter required")
+  }
+
   file { "${name}.list":
     path => "${apt::params::root}/sources.list.d/${name}.list",
     ensure => file,
@@ -22,7 +27,6 @@ define apt::source(
     group => root,
     mode => 644,
     content => template("apt/source.list.erb"),
-
   }
 
   if $pin != false {
@@ -36,24 +40,21 @@ define apt::source(
   }
 
   if $required_packages != false {
-    exec { "${apt::params::provider} -y install ${required_packages}":
-      subscribe => File["${name}.list"],
+    exec { "Required packages: '${required_packages}' for ${name}":
+      command     => "${apt::params::provider} -y install ${required_packages}",
+      subscribe   => File["${name}.list"],
       refreshonly => true,
     }
   }
 
   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"],
-      }
+    apt::key { "Add key: ${key} from Apt::Source ${title}":
+      key         => $key,
+      ensure      => present,
+      key_server  => $key_server,
+      key_content => $key_content,
+      key_source  => $key_source,
+      before      => File["${name}.list"],
     }
   }
 }