Merge pull request #537 from mhaskel/lucid_fix

Don't add puppetlabs sources for lucid
puppetlabs · Jun 17, 2015 · 7971ec2 · 7971ec2
2 parents eaf5794 + 8d98105
commit 7971ec2
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/spec/acceptance/apt_spec.rb b/spec/acceptance/apt_spec.rb
@@ -23,14 +23,16 @@ class { 'apt':
           'preferences'    => true,
           'preferences.d'  => true,
         },
-        sources => {
-          'puppetlabs' => {
-            'ensure'   => present,
-            'location' => 'http://apt.puppetlabs.com',
-            'repos'    => 'main',
-            'key'      => {
-              'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
-              'server' => 'pgp.mit.edu',
+        sources => ? $::lsbdiscodename {
+          'lucid' => undef,
+          default => { 'puppetlabs' => {
+              'ensure'   => present,
+              'location' => 'http://apt.puppetlabs.com',
+              'repos'    => 'main',
+              'key'      => {
+                'id'     => '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30',
+                'server' => 'pgp.mit.edu',
+              },
             },
           },
         },