Skip to content

Commit

Permalink
Updates apt::source usage
Browse files Browse the repository at this point in the history
The use of key_source in apt::source is deprecated since puppetlabs/apt
version 2.1.1 (at least) and removed in version 4.0.0.
Idem with required_packages and include
  • Loading branch information
amateo committed Aug 30, 2017
1 parent d8587b2 commit 75a19eb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
19 changes: 12 additions & 7 deletions manifests/repos.pp
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,19 @@
$key_source = $docker::package_key_source
$package_key = $docker::package_key
}
package {['debian-keyring', 'debian-archive-keyring']:
ensure => installed,
}
apt::source { 'docker':
location => $location,
release => $docker::package_release,
repos => $docker::package_repos,
key => $package_key,
key_source => $key_source,
required_packages => 'debian-keyring debian-archive-keyring',
include_src => false,
location => $location,
release => $docker::package_release,
repos => $docker::package_repos,
key => {
id => $package_key,
source => $key_source,
},
require => Package['debian-keyring', 'debian-archive-keyring'],
include => { 'src' => false, },
}
$url_split = split($location, '/')
$repo_host = $url_split[2]
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"issues_url": "https://github.com/garethr/garethr-docker/issues",
"dependencies": [
{"name":"puppetlabs/stdlib","version_requirement":">= 4.1.0"},
{"name":"puppetlabs/apt","version_requirement":">= 1.8.0 <= 3.0.0"},
{"name":"puppetlabs/apt","version_requirement":">= 2.1.0"},
{"name":"stahnma/epel","version_requirement":">= 0.0.6"}
],
"data_provider": null,
Expand Down

0 comments on commit 75a19eb

Please sign in to comment.