X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=manifests%2Fsource.pp;h=999ff68bf93d8c1f16395ae2f64333d68d9b4bbd;hb=34fcd1935e4ee0fc4d9a38769b24f6dfdb5c4999;hp=d6d93e488691be5ce66cf176071d306a9ddeaad8;hpb=71fc4251767bc4784769aead6a6273250359dbe2;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/manifests/source.pp b/manifests/source.pp
index d6d93e4..999ff68 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -2,49 +2,62 @@
 # add an apt source
 
 define apt::source(
-	$location = '',
-	$release = 'karmic',
-	$repos = 'main',
-	$include_src = true,
-	$required_packages = false,
-	$key = false,
-	$key_server = 'keyserver.ubuntu.com',
-	$pin = false
+  $location = '',
+  $release = $lsbdistcodename,
+  $repos = 'main',
+  $include_src = true,
+  $required_packages = false,
+  $key = false,
+  $key_server = 'keyserver.ubuntu.com',
+  $key_content = false,
+  $key_source  = false,
+  $pin = false
 ) {
 
-	include apt
-
-	file { "${name}.list":
-		name => "${apt::root}/sources.list.d/${name}.list",
-		ensure => file,
-		owner => root,
-		group => root,
-		mode => 644,
-		content => template("apt/source.list.erb"),
-	}
-
-	if $pin != false {
-		apt::pin { "${release}": priority => "${pin}" }
-	}
-
-	exec { "${name} apt update":
-		command => "${apt::provider} update",
-		subscribe => File["${name}.list"],
-		refreshonly => true,
-	}
-
-	if $required_packages != false {
-		exec { "${apt::provider} -y install ${required_packages}":
-			subscribe => File["${name}.list"],
-			refreshonly => true,
-		}
-	}
-
-	if $key != false {
-		exec { "/usr/bin/apt-key adv --keyserver ${key_server} --recv-keys ${key}":
-			unless => "/usr/bin/apt-key list | grep ${key}",
-			before => File["${name}.list"],
-		}
-	}
-
+  include apt::params
+
+  if $release == undef {
+    fail('lsbdistcodename fact not available: release parameter required')
+  }
+
+  file { "${name}.list":
+    ensure  => file,
+    path    => "${apt::params::root}/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,
+      before   => File["${name}.list"]
+    }
+  }
+
+  exec { "${name} apt update":
+    command     => "${apt::params::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}",
+      subscribe   => File["${name}.list"],
+      refreshonly => true,
+    }
+  }
+
+  if $key != false {
+    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"],
+    }
+  }
 }