diff --git a/manifests/repos.pp b/manifests/repos.pp index b6c6a7a3..323f8038 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -53,15 +53,6 @@ if $docker::manage_package { include apt - if (versioncmp($facts['facterversion'], '2.4.6') <= 0) { - if $facts['os']['name'] == 'Debian' and $facts['os']['lsb']['distcodename'] == 'wheezy' { - include apt::backports - } - } else { - if $facts['os']['name'] == 'Debian' and $facts['os']['distro']['codename'] == 'wheezy' { - include apt::backports - } - } Exec['apt_update'] -> Package[$docker::prerequired_packages] Apt::Source['docker'] -> Package['docker'] } diff --git a/spec/shared_examples/repos.rb b/spec/shared_examples/repos.rb index 8330f8ee..f19cb8b5 100644 --- a/spec/shared_examples/repos.rb +++ b/spec/shared_examples/repos.rb @@ -65,12 +65,6 @@ expect(subject).to contain_class('apt') } - if facts[:os]['name'] == 'Debian' && facts[:os]['distro']['codename'] == 'wheezy' - it { - expect(subject).to contain_class('apt::backports') - } - end - it { params['prerequired_packages'].each do |package| expect(subject).to contain_exec('apt_update').that_comes_before("package[#{package}]")