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
(#14308) Add ensure=>absent for define resource.
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
source.pp
diff --git
a/manifests/source.pp
b/manifests/source.pp
index 4c03412c5fb8f81979710fda460008a669fe5da1..c63fc2fb2282d5bd2dc457a256442683747b6b13 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',
@@
-16,42
+17,48
@@
define apt::source(
include apt::params
include apt::params
- if ! $release {
- fail("lsbdistcodename fact not available: release parameter required")
+ $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":
}
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"),
-
+ ensure => $ensure,
+ path => "${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"]
+ if ($pin != false) and ($ensure == 'present') {
+ apt::pin { $release:
+ priority => $pin,
+ before => File["${name}.list"]
+ }
}
exec { "${name} apt update":
}
exec { "${name} apt update":
- command
=> "${apt::params::
provider} update",
- subscribe => File["${name}.list"],
+ command
=> "${
provider} update",
+ subscribe
=> File["${name}.list"],
refreshonly => true,
}
refreshonly => true,
}
- if
$required_packages != false
{
+ if
($required_packages != false) and ($ensure == 'present')
{
exec { "Required packages: '${required_packages}' for ${name}":
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,
}
}
subscribe => File["${name}.list"],
refreshonly => true,
}
}
- 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}":
apt::key { "Add key: ${key} from Apt::Source ${title}":
- key => $key,
ensure => present,
ensure => present,
+ key => $key,
key_server => $key_server,
key_content => $key_content,
key_source => $key_source,
key_server => $key_server,
key_content => $key_content,
key_source => $key_source,