From a0a28a692b8ad4710d6555d798430704c060afd1 Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Tue, 19 Jul 2022 15:16:40 +0200 Subject: [PATCH] Don't try to guess docker_version --- manifests/init.pp | 5 +---- spec/classes/repos_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 76f89102..84ab38ac 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -552,10 +552,7 @@ Enum['archive','package'] $containerd_install_method = 'archive', String $containerd_package_name = 'containerd.io', String $docker_package_name = 'docker-engine', - Optional[String] $docker_version = $facts['os']['family'] ? { - 'Debian' => '5:20.10.11~3-0~ubuntu-' + $facts['os']['distro']['codename'], - 'RedHat' => '17.03.1.ce-1.el7.centos', - }, + Optional[String] $docker_version = undef, Boolean $pin_packages = false, String $dns_domain = 'cluster.local', Optional[String] $cni_pod_cidr = undef, diff --git a/spec/classes/repos_spec.rb b/spec/classes/repos_spec.rb index f3cf0849..60d8525a 100644 --- a/spec/classes/repos_spec.rb +++ b/spec/classes/repos_spec.rb @@ -52,7 +52,7 @@ it { should contain_apt__source('docker').with( :ensure => 'present', - :location => 'https://apt.dockerproject.org/repo', + :location => 'https://download.docker.com/linux/ubuntu', :repos => 'main', :release => 'xenial', :key => { 'id' => '9DC858229FC7DD38854AE2D88D81803C0EBFCD88', 'source' => 'https://download.docker.com/linux/ubuntu/gpg' } @@ -109,7 +109,7 @@ it { should contain_apt__source('docker').with( :ensure => 'present', - :location => 'https://apt.dockerproject.org/repo', + :location => 'https://download.docker.com/linux/ubuntu', :repos => 'main', :release => 'xenial', :key => { 'id' => '9DC858229FC7DD38854AE2D88D81803C0EBFCD88', 'source' => 'https://download.docker.com/linux/ubuntu/gpg' }