diff --git a/README.md b/README.md index 0466d43a..48f103d3 100644 --- a/README.md +++ b/README.md @@ -62,14 +62,6 @@ class { 'docker': } ``` -Using a version prior to 17.06, configures and installs from the old repositories: - -```puppet -class { 'docker': - version => '1.12.0-0~wheezy', -} -``` - Docker provides a enterprise addition of the [Docker Engine](https://www.docker.com/enterprise-edition), called Docker EE. To install Docker EE on Debian systems, add the following code to the manifest file: ```puppet diff --git a/manifests/repos.pp b/manifests/repos.pp index b6c6a7a3..c61d2fd5 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -52,21 +52,12 @@ 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'] } } } + 'RedHat': { if ($docker::manage_package) { $baseurl = $location @@ -85,6 +76,7 @@ } } } + default: {} } } 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}]")