From 492394e701a694c9c22c0963b2d9f4ade609e030 Mon Sep 17 00:00:00 2001
From: Micah Figone <micah@uber.com>
Date: Mon, 10 Jul 2017 18:29:54 -0700
Subject: [PATCH 1/2] fix deprecated apt:source parameters fix spec tests to
 use new format

---
 manifests/repo.pp                     | 4 +++-
 spec/classes/vmwaretools_repo_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manifests/repo.pp b/manifests/repo.pp
index 0e65571..3491df0 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -224,7 +224,9 @@
             location   => $baseurl_url,
             key_source => $gpgkey,
             #key        => '0xC0B5E0AB66FD4949',
-            key        => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949',
+            key        => {
+              id => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949',
+            }
           }
         }
         default: { }
diff --git a/spec/classes/vmwaretools_repo_spec.rb b/spec/classes/vmwaretools_repo_spec.rb
index c7ccd92..3f3da92 100644
--- a/spec/classes/vmwaretools_repo_spec.rb
+++ b/spec/classes/vmwaretools_repo_spec.rb
@@ -127,7 +127,7 @@
         :location   => 'http://packages.vmware.com/tools/esx/latest/ubuntu',
         :key_source => 'http://packages.vmware.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub',
        #:key        => '0xC0B5E0AB66FD4949',
-        :key        => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949'
+        :key        => { 'id' => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949' }
       )}
     end
   end

From 4f6f7722329c809a8e68c365d4188a7e4763dd6c Mon Sep 17 00:00:00 2001
From: Micah Figone <micah@uber.com>
Date: Tue, 11 Jul 2017 18:03:48 -0700
Subject: [PATCH 2/2] updates for key_source as well

---
 manifests/repo.pp                     | 5 ++---
 spec/classes/vmwaretools_repo_spec.rb | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/manifests/repo.pp b/manifests/repo.pp
index 3491df0..30891ce 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -222,10 +222,9 @@
             ensure     => $ensure,
             comment    => "VMware Tools ${tools_version} - ${vmwaretools::params::baseurl_string} ${::lsbdistcodename}",
             location   => $baseurl_url,
-            key_source => $gpgkey,
-            #key        => '0xC0B5E0AB66FD4949',
             key        => {
-              id => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949',
+              id     => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949',
+              source => $gpgkey,
             }
           }
         }
diff --git a/spec/classes/vmwaretools_repo_spec.rb b/spec/classes/vmwaretools_repo_spec.rb
index 3f3da92..85d74e6 100644
--- a/spec/classes/vmwaretools_repo_spec.rb
+++ b/spec/classes/vmwaretools_repo_spec.rb
@@ -125,9 +125,8 @@
         :comment    => 'VMware Tools latest - ubuntu precise',
         :ensure     => 'present',
         :location   => 'http://packages.vmware.com/tools/esx/latest/ubuntu',
-        :key_source => 'http://packages.vmware.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub',
        #:key        => '0xC0B5E0AB66FD4949',
-        :key        => { 'id' => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949' }
+        :key        => { 'id' => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949', 'source' => 'http://packages.vmware.com/tools/keys/VMWARE-PACKAGING-GPG-RSA-KEY.pub' }
       )}
     end
   end