X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=3d4011e26dda5bb352410bbc9d7720dfa3119737;hb=e5f2dfe294a563f5ebcec3d31949a81e1815db6e;hp=475bee3bf04c4e9a069eb615df8cd28916a91296;hpb=8cdaf855a1d0dd24fed02fc3ee9941e0a1e6849b;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index 475bee3..3d4011e 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -3,7 +3,7 @@
 
 define apt::source(
   $location = '',
-  $release = 'karmic',
+  $release = $lsbdistcodename,
   $repos = 'main',
   $include_src = true,
   $required_packages = false,
@@ -16,29 +16,35 @@ define apt::source(
 
   include apt::params
 
-  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"),
+  $sources_list_d = $apt::params::sources_list_d
+  $provider       = $apt::params::provider
+
+  if $release == undef {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
 
+  file { "${name}.list":
+    ensure  => file,
+    path    => "${apt::params::sources_list_d}/${name}.list",
+    owner   => root,
+    group   => root,
+    mode    => '0644',
+    content => template("${module_name}/source.list.erb"),
   }
 
   if $pin != false {
-    apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+    apt::pin { $release: priority => $pin } -> File["${name}.list"]
   }
 
   exec { "${name} apt update":
-    command => "${apt::params::provider} update",
-    subscribe => File["${name}.list"],
+    command     => "${provider} update",
+    subscribe   => File["${name}.list"],
     refreshonly => true,
   }
 
   if $required_packages != false {
     exec { "Required packages: '${required_packages}' for ${name}":
-      command     => "${apt::params::provider} -y install ${required_packages}",
+      command     => "${provider} -y install ${required_packages}",
       subscribe   => File["${name}.list"],
       refreshonly => true,
     }
@@ -46,8 +52,8 @@ define apt::source(
 
   if $key != false {
     apt::key { "Add key: ${key} from Apt::Source ${title}":
-      key         => $key,
       ensure      => present,
+      key         => $key,
       key_server  => $key_server,
       key_content => $key_content,
       key_source  => $key_source,