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 #55 from nanliu/tb/containment
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
source.pp
diff --git
a/manifests/source.pp
b/manifests/source.pp
index 204639bdc5734547a5a7710f85af0a9d70c9cff8..e55cafdfd1f4fbb493247f88b5a497270eec743e 100644
(file)
--- a/
manifests/source.pp
+++ b/
manifests/source.pp
@@
-2,6
+2,7
@@
# add an apt source
define apt::source(
# add an apt source
define apt::source(
+ $ensure = present,
$location = '',
$release = $lsbdistcodename,
$repos = 'main',
$location = '',
$release = $lsbdistcodename,
$repos = 'main',
@@
-15,6
+16,7
@@
define apt::source(
) {
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
@@
-24,25
+26,23
@@
define apt::source(
}
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: priority => $pin } -> File["${name}.list"]
- }
-
- exec { "${name} apt update":
- command => "${provider} update",
- subscribe => File["${name}.list"],
- refreshonly => true,
+ if ($pin != false) and ($ensure == 'present') {
+ apt::pin { $release:
+ priority => $pin,
+ before => File["${name}.list"]
+ }
}
}
- if
$required_packages != false
{
+ if
($required_packages != false) and ($ensure == 'present')
{
exec { "Required packages: '${required_packages}' for ${name}":
command => "${provider} -y install ${required_packages}",
subscribe => File["${name}.list"],
exec { "Required packages: '${required_packages}' for ${name}":
command => "${provider} -y install ${required_packages}",
subscribe => File["${name}.list"],
@@
-50,7
+50,8
@@
define apt::source(
}
}
}
}
- 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,
@@
-60,4
+61,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'],
+ }
}
}