Merge pull request #537 from mhaskel/lucid_fix

Don't add puppetlabs sources for lucid
This commit is contained in:
Bryan Jen 2015-06-17 12:01:31 -07:00
commit 7971ec26d7

View file

@ -23,14 +23,16 @@ describe 'apt class' do
'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',
},
},
},
},