Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #122 from strangeman/master
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
source.pp
diff --git
a/manifests/source.pp
b/manifests/source.pp
index 17d2d8e5a2a2ad61f8bf58f5287edfd487dde70f..a859174a1aaef9296a74bc8ec8c6acd51d096f1a 100644
(file)
--- a/
manifests/source.pp
+++ b/
manifests/source.pp
@@
-2,58
+2,70
@@
# add an apt source
define apt::source(
# add an apt source
define apt::source(
- $location = '',
- $release = $lsbdistcodename,
- $repos = 'main',
- $include_src = true,
+ $ensure = present,
+ $location = '',
+ $release = 'UNDEF',
+ $repos = 'main',
+ $include_src = true,
$required_packages = false,
$required_packages = false,
- $key = false,
- $key_server = 'keyserver.ubuntu.com',
- $key_content = false,
- $key_source = false,
- $pin = false
+ $key
= false,
+ $key_server
= 'keyserver.ubuntu.com',
+ $key_content
= false,
+ $key_source
= false,
+ $pin
= false
) {
include apt::params
) {
include apt::params
+ include apt::update
$sources_list_d = $apt::params::sources_list_d
$provider = $apt::params::provider
$sources_list_d = $apt::params::sources_list_d
$provider = $apt::params::provider
- if $release == undef {
- fail('lsbdistcodename fact not available: release parameter required')
+ if $release == 'UNDEF' {
+ if $::lsbdistcodename == undef {
+ fail('lsbdistcodename fact not available: release parameter required')
+ } else {
+ $release_real = $::lsbdistcodename
+ }
+ } else {
+ $release_real = $release
}
file { "${name}.list":
}
file { "${name}.list":
- ensure =>
fil
e,
+ ensure =>
$ensur
e,
path => "${sources_list_d}/${name}.list",
owner => root,
group => root,
mode => '0644',
content => template("${module_name}/source.list.erb"),
path => "${sources_list_d}/${name}.list",
owner => root,
group => root,
mode => '0644',
content => template("${module_name}/source.list.erb"),
+ notify => Exec['apt_update'],
}
}
- if $pin != false {
- apt::pin { $release:
+
+ 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,
priority => $pin,
- before => File["${name}.list"]
+ before => File["${name}.list"],
+ origin => $host,
}
}
}
}
- exec { "${name} apt update":
- command => "${provider} update",
- subscribe => File["${name}.list"],
- refreshonly => true,
- }
-
- if $required_packages != false {
+ if ($required_packages != false) and ($ensure == 'present') {
exec { "Required packages: '${required_packages}' for ${name}":
command => "${provider} -y install ${required_packages}",
exec { "Required packages: '${required_packages}' for ${name}":
command => "${provider} -y install ${required_packages}",
-
subscribe => File["${name}.list"]
,
+
logoutput => 'on_failure'
,
refreshonly => true,
refreshonly => true,
+ subscribe => File["${name}.list"],
}
}
}
}
- if $key != false {
+ # We do not want to remove keys when the source is absent.
+ if ($key != false) and ($ensure == 'present') {
apt::key { "Add key: ${key} from Apt::Source ${title}":
ensure => present,
key => $key,
apt::key { "Add key: ${key} from Apt::Source ${title}":
ensure => present,
key => $key,
@@
-63,4
+75,9
@@
define apt::source(
before => File["${name}.list"],
}
}
before => File["${name}.list"],
}
}
+
+ # Need anchor to provide containment for dependencies.
+ anchor { "apt::source::${name}":
+ require => Class['apt::update'],
+ }
}
}