From c107de17c5a191d2277cb646d6120c1710a2ee3e Mon Sep 17 00:00:00 2001 From: jurim76 Date: Fri, 13 Jul 2018 14:30:54 +0300 Subject: [PATCH 1/3] puppetlabs-apt-4 support Added apt-4 compatible apt::source for Debian > 8 --- manifests/repos.pp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/manifests/repos.pp b/manifests/repos.pp index 3436ec733..74a3ac7c2 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -17,6 +17,7 @@ $key_source = $docker::package_key_source $package_key = $docker::package_key } + if $::lsbmajdistrelease <= '8' { apt::source { 'docker': location => $location, release => $docker::package_release, @@ -26,6 +27,16 @@ required_packages => 'debian-keyring debian-archive-keyring', include_src => false, } + } else { + apt::source { 'docker': + location => $location, + release => $docker::package_release, + repos => $docker::package_repos, + key => { 'id' => $package_key, 'source' => $key_source }, + pin => '10', + include => { 'src' => false } + } + } $url_split = split($location, '/') $repo_host = $url_split[2] $pin_ensure = $docker::pin_upstream_package_source ? { From 73f9dc3c26634e426ea8b7d3e3bfeb15ada23e1d Mon Sep 17 00:00:00 2001 From: jurim76 Date: Fri, 13 Jul 2018 14:46:37 +0300 Subject: [PATCH 2/3] puppet linting --- manifests/repos.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/manifests/repos.pp b/manifests/repos.pp index 74a3ac7c2..b0c84458a 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -29,12 +29,12 @@ } } else { apt::source { 'docker': - location => $location, - release => $docker::package_release, - repos => $docker::package_repos, - key => { 'id' => $package_key, 'source' => $key_source }, - pin => '10', - include => { 'src' => false } + location => $location, + release => $docker::package_release, + repos => $docker::package_repos, + key => { 'id' => $package_key, 'source' => $key_source }, + pin => '10', + include => { 'src' => false } } } $url_split = split($location, '/') From aec970fc2ae0f39936d163a6575162acd72a5335 Mon Sep 17 00:00:00 2001 From: jurim76 Date: Fri, 13 Jul 2018 14:52:25 +0300 Subject: [PATCH 3/3] puppet linting --- manifests/repos.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/repos.pp b/manifests/repos.pp index b0c84458a..99297c265 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -17,7 +17,7 @@ $key_source = $docker::package_key_source $package_key = $docker::package_key } - if $::lsbmajdistrelease <= '8' { + if $::lsbmajdistrelease <= '8' { apt::source { 'docker': location => $location, release => $docker::package_release, @@ -25,9 +25,10 @@ key => $package_key, key_source => $key_source, required_packages => 'debian-keyring debian-archive-keyring', + pin => '10', include_src => false, } - } else { + } else { apt::source { 'docker': location => $location, release => $docker::package_release,