# add an apt source
define apt::source(
+ $comment = $name,
$ensure = present,
$location = '',
- $release = $lsbdistcodename,
+ $release = 'UNDEF',
$repos = 'main',
$include_src = true,
+ $include_deb = true,
$required_packages = false,
- $key = false,
+ $key = undef,
$key_server = 'keyserver.ubuntu.com',
- $key_content = false,
- $key_source = false,
- $pin = false
+ $key_content = undef,
+ $key_source = undef,
+ $pin = false,
+ $architecture = undef
) {
include apt::params
$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":
if ($required_packages != false) and ($ensure == 'present') {
exec { "Required packages: '${required_packages}' for ${name}":
command => "${provider} -y install ${required_packages}",
- subscribe => File["${name}.list"],
+ logoutput => 'on_failure',
refreshonly => true,
+ tries => 3,
+ try_sleep => 1,
+ subscribe => File["${name}.list"],
+ before => Exec['apt_update'],
}
}
# We do not want to remove keys when the source is absent.
- if ($key != false) and ($ensure == 'present') {
+ if $key and ($ensure == 'present') {
apt::key { "Add key: ${key} from Apt::Source ${title}":
ensure => present,
key => $key,