Fully update to support puppetlabs/apt 2.x.

Remove support for apt::source parameter `include_src`. Remove fixtures pin to puppetlabs/apt 1.8.0.
voxpupuli · Jan 21, 2016 · e00cf75 · e00cf75
1 parent 6fd3f6b
commit e00cf75
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -3,8 +3,6 @@ fixtures:
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     vmware_puppetfact: "https://github.com/wolfspyre/vmware_puppetfact.git"
     zypprepo: "https://github.com/deadpoint/puppet-zypprepo.git"
-    apt:
-      repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
-      ref: "1.8.0"
+    apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
   symlinks:
     vmwaretools: "#{source_dir}"
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -219,13 +219,12 @@
 
           include '::apt'
           apt::source { 'vmware-tools':
-            ensure      => $ensure,
-            comment     => "VMware Tools ${tools_version} - ${vmwaretools::params::baseurl_string} ${::lsbdistcodename}",
-            location    => $baseurl_url,
-            key_source  => $gpgkey,
-            #key         => '0xC0B5E0AB66FD4949',
-            key         => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949',
-            include_src => false,
+            ensure     => $ensure,
+            comment    => "VMware Tools ${tools_version} - ${vmwaretools::params::baseurl_string} ${::lsbdistcodename}",
+            location   => $baseurl_url,
+            key_source => $gpgkey,
+            #key        => '0xC0B5E0AB66FD4949',
+            key        => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949',
           }
         }
         default: { }

diff --git a/metadata.json b/metadata.json
@@ -14,12 +14,12 @@
       "version_requirement": ">=2.3.0 <5.0.0"
     },
     {
-      "version_requirement": "1.x",
-      "name": "darin/zypprepo"
+      "name": "darin/zypprepo",
+      "version_requirement": "1.x"
     },
     {
       "name": "puppetlabs/apt",
-      "version_requirement": "<3.0.0"
+      "version_requirement": ">=2.0.0 <3.0.0"
     },
     {
       "name": "wolfspyre/vmware_puppetfact",

diff --git a/spec/classes/vmwaretools_repo_spec.rb b/spec/classes/vmwaretools_repo_spec.rb
@@ -107,13 +107,12 @@
       }
       end
       it { should contain_apt__source('vmware-tools').with(
-        :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         => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949',
-        :include_src => false
+        :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        => '36E47E1CC4DCC5E8152D115CC0B5E0AB66FD4949'
       )}
     end
   end