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
Add optional architecture qualifier to apt-sources
[puppet-modules/puppetlabs-apt.git]
/
manifests
/
source.pp
diff --git
a/manifests/source.pp
b/manifests/source.pp
index 475bee3bf04c4e9a069eb615df8cd28916a91296..64461ee57abb36d827bcfc770829a9d13d456cc8 100644
(file)
--- a/
manifests/source.pp
+++ b/
manifests/source.pp
@@
-2,56
+2,83
@@
# add an apt source
define apt::source(
# add an apt source
define apt::source(
- $location = '',
- $release = 'karmic',
- $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,
+ $architecture = undef
) {
include apt::params
) {
include apt::params
+ include apt::update
- 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' {
+ if $::lsbdistcodename == undef {
+ fail('lsbdistcodename fact not available: release parameter required')
+ } else {
+ $release_real = $::lsbdistcodename
+ }
+ } else {
+ $release_real = $release
}
}
- if $pin != false {
- apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+ file { "${name}.list":
+ ensure => $ensure,
+ path => "${sources_list_d}/${name}.list",
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => template("${module_name}/source.list.erb"),
+ notify => Exec['apt_update'],
}
}
- exec { "${name} apt update":
- command => "${apt::params::provider} update",
- subscribe => File["${name}.list"],
- refreshonly => true,
+
+ 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,
+ before => File["${name}.list"],
+ origin => $host,
+ }
}
}
- 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}",
-
subscribe => File["${name}.list"]
,
+ command => "${provider} -y install ${required_packages}",
+
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}":
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,
before => File["${name}.list"],
}
}
key_server => $key_server,
key_content => $key_content,
key_source => $key_source,
before => File["${name}.list"],
}
}
+
+ # Need anchor to provide containment for dependencies.
+ anchor { "apt::source::${name}":
+ require => Class['apt::update'],
+ }
}
}