From 4f2d6a08668619780bf31ba31a5984ba299ef3e7 Mon Sep 17 00:00:00 2001
From: Eelco Wesemann <eelco@hoppinger.com>
Date: Tue, 1 Aug 2017 15:05:11 +0200
Subject: [PATCH 1/6] Update towards the new apt module

---
 manifests/repos.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 3436ec733..b8898a265 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -21,10 +21,14 @@
           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,
+          key               => {
+            'id'     => $package_key,
+            'server' => $key_source,
+          },
+          include           =>  {
+            'src' => false,
+          },
         }
         $url_split = split($location, '/')
         $repo_host = $url_split[2]

From 78c1db72f474dfa71ebd494bc0d0c115c73eadac Mon Sep 17 00:00:00 2001
From: Eelco Wesemann <eelco@hoppinger.com>
Date: Tue, 1 Aug 2017 15:15:19 +0200
Subject: [PATCH 2/6] Remove required_packages

---
 manifests/repos.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index b8898a265..283ecdb49 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -21,7 +21,6 @@
           location          => $location,
           release           => $docker::package_release,
           repos             => $docker::package_repos,
-          required_packages => 'debian-keyring debian-archive-keyring',
           key               => {
             'id'     => $package_key,
             'server' => $key_source,

From fc3f8e8e96e19bcb73d8890e694360b342b914cd Mon Sep 17 00:00:00 2001
From: Eelco Wesemann <eelco@hoppinger.com>
Date: Tue, 1 Aug 2017 15:22:40 +0200
Subject: [PATCH 3/6] Set key source understood by puppetlabs/apt::source

---
 manifests/params.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index ad01fc227..5bc5af694 100755
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -136,7 +136,7 @@
       $package_cs_key_source = 'https://packages.docker.com/1.9/apt/gpg'
       $package_cs_key = '0xee6d536cf7dc86e2d7d56f59a178ac6c6238f52e'
       $package_source_location = 'http://apt.dockerproject.org/repo'
-      $package_key_source = 'https://apt.dockerproject.org/gpg'
+      $package_key_source = 'https://pgp.mit.edu'
       $package_key = '58118E89F3A912897C070ADBF76221572C52609D'
 
       if ($::operatingsystem == 'Debian' and versioncmp($::operatingsystemmajrelease, '8') >= 0) or

From 42ed2c696638a9cef522b9c0ecc22fa130bc7092 Mon Sep 17 00:00:00 2001
From: Eelco Wesemann <eelco@hoppinger.com>
Date: Tue, 1 Aug 2017 15:31:40 +0200
Subject: [PATCH 4/6] Boyscout

---
 manifests/repos.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/repos.pp b/manifests/repos.pp
index 283ecdb49..90f46887e 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -18,14 +18,14 @@
           $package_key = $docker::package_key
         }
         apt::source { 'docker':
-          location          => $location,
-          release           => $docker::package_release,
-          repos             => $docker::package_repos,
-          key               => {
+          location =>  $location,
+          release  => $docker::package_release,
+          repos    => $docker::package_repos,
+          key      => {
             'id'     => $package_key,
             'server' => $key_source,
           },
-          include           =>  {
+          include  => {
             'src' => false,
           },
         }

From 80e1262899145a1d5229aafc9609e7fa899e69ef Mon Sep 17 00:00:00 2001
From: Eelco Wesemann <eelco@hoppinger.com>
Date: Wed, 2 Aug 2017 08:45:59 +0200
Subject: [PATCH 5/6] Also works on Ubuntu 16.04

---
 metadata.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index bd858fec4..9364757bc 100755
--- a/metadata.json
+++ b/metadata.json
@@ -31,7 +31,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "12.04",
-        "14.04"
+        "14.04",
+        "16.04"
       ]
     },
     {

From a9b0ef26ab7b4901a0322be3498b971706c9948f Mon Sep 17 00:00:00 2001
From: Eelco Wesemann <eelco@hoppinger.com>
Date: Wed, 2 Aug 2017 08:46:16 +0200
Subject: [PATCH 6/6] Set new requirements

---
 metadata.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/metadata.json b/metadata.json
index 9364757bc..3e3394cd0 100755
--- a/metadata.json
+++ b/metadata.json
@@ -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":"<= 4.0.0"},
     {"name":"stahnma/epel","version_requirement":">= 0.0.6"}
   ],
   "data_provider": null,
@@ -58,7 +58,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 3.4.0"
+      "version_requirement": ">= 4.7.0"
     }
   ]
 }