From 55b03a41b2979de3a1db40444abcd775ecd7f7a1 Mon Sep 17 00:00:00 2001
From: Etienne Champetier <champetier.etienne@gmail.com>
Date: Mon, 11 Jan 2021 15:35:33 -0500
Subject: [PATCH] containerd-common,containerd,docker: remove ubuntu arch
specific vars
By removing ancient version we don't need arch specific vars
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
---
.../containerd-common/vars/ubuntu-amd64.yml | 13 ----
.../vars/{ubuntu-arm64.yml => ubuntu.yml} | 0
.../vars/{ubuntu-amd64.yml => ubuntu.yml} | 0
.../docker/vars/ubuntu-amd64.yml | 62 -------------------
.../vars/{ubuntu-arm64.yml => ubuntu.yml} | 1 -
5 files changed, 76 deletions(-)
delete mode 100644 roles/container-engine/containerd-common/vars/ubuntu-amd64.yml
rename roles/container-engine/containerd-common/vars/{ubuntu-arm64.yml => ubuntu.yml} (100%)
rename roles/container-engine/containerd/vars/{ubuntu-amd64.yml => ubuntu.yml} (100%)
delete mode 100644 roles/container-engine/docker/vars/ubuntu-amd64.yml
rename roles/container-engine/docker/vars/{ubuntu-arm64.yml => ubuntu.yml} (98%)
diff --git a/roles/container-engine/containerd-common/vars/ubuntu-amd64.yml b/roles/container-engine/containerd-common/vars/ubuntu-amd64.yml
deleted file mode 100644
index 9b98dce96..000000000
--- a/roles/container-engine/containerd-common/vars/ubuntu-amd64.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-containerd_versioned_pkg:
- 'latest': "{{ containerd_package }}"
- '1.2.4': "{{ containerd_package }}=1.2.4-1"
- '1.2.5': "{{ containerd_package }}=1.2.5-1"
- '1.2.6': "{{ containerd_package }}=1.2.6-3"
- '1.2.10': "{{ containerd_package }}=1.2.10-3"
- '1.2.12': "{{ containerd_package }}=1.2.12-1"
- '1.2.13': "{{ containerd_package }}=1.2.13-2"
- '1.3.7': "{{ containerd_package }}=1.3.7-1"
- '1.3.9': "{{ containerd_package }}=1.3.9-1"
- 'stable': "{{ containerd_package }}=1.3.9-1"
- 'edge': "{{ containerd_package }}=1.3.9-1"
diff --git a/roles/container-engine/containerd-common/vars/ubuntu-arm64.yml b/roles/container-engine/containerd-common/vars/ubuntu.yml
similarity index 100%
rename from roles/container-engine/containerd-common/vars/ubuntu-arm64.yml
rename to roles/container-engine/containerd-common/vars/ubuntu.yml
diff --git a/roles/container-engine/containerd/vars/ubuntu-amd64.yml b/roles/container-engine/containerd/vars/ubuntu.yml
similarity index 100%
rename from roles/container-engine/containerd/vars/ubuntu-amd64.yml
rename to roles/container-engine/containerd/vars/ubuntu.yml
diff --git a/roles/container-engine/docker/vars/ubuntu-amd64.yml b/roles/container-engine/docker/vars/ubuntu-amd64.yml
deleted file mode 100644
index 3662580c6..000000000
--- a/roles/container-engine/docker/vars/ubuntu-amd64.yml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-docker_kernel_min_version: '3.10'
-
-# https://download.docker.com/linux/ubuntu/
-docker_versioned_pkg:
- 'latest': docker-ce
- '1.11': docker-engine=1.11.2-0~{{ ansible_distribution_release|lower }}
- '1.12': docker-engine=1.12.6-0~ubuntu-{{ ansible_distribution_release|lower }}
- '1.13': docker-engine=1.13.1-0~ubuntu-{{ ansible_distribution_release|lower }}
- '17.03': docker-ce=17.03.2~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
- '17.09': docker-ce=17.09.0~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
- '17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
- '18.06': docker-ce=18.06.2~ce~3-0~ubuntu
- '18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- '19.03': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- '20.10': docker-ce=5:20.10.2~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- 'stable': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- 'edge': docker-ce=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
-
-docker_cli_versioned_pkg:
- 'latest': docker-ce-cli
- '18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- '19.03': docker-ce-cli=5:19.03.14~3-0~ubuntu-{{ ansible_distribution_release|lower }}
- '20.10': docker-ce-cli=5:20.10.2~3-0~ubuntu-{{ ansible_distribution_release|lower }}
-
-docker_package_info:
- pkg_mgr: apt
- pkgs:
- - name: "{{ containerd_versioned_pkg[containerd_version | string] }}"
- force: yes
- - name: "{{ docker_cli_versioned_pkg[docker_cli_version | string] }}"
- force: yes
- - name: "{{ docker_versioned_pkg[docker_version | string] }}"
- force: yes
-
-docker_repo_key_info:
- pkg_key: apt_key
- url: '{{ docker_ubuntu_repo_gpgkey }}'
- repo_keys:
- - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
-
-docker_repo_info:
- pkg_repo: apt_repository
- repos:
- - >
- deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
- {{ ansible_distribution_release|lower }}
- stable
-
-dockerproject_repo_key_info:
- pkg_key: apt_key
- url: '{{ docker_ubuntu_repo_gpgkey }}'
- repo_keys:
- - 58118E89F3A912897C070ADBF76221572C52609D
-
-dockerproject_repo_info:
- pkg_repo: apt_repository
- repos:
- - >
- deb [arch={{ host_architecture }}] {{ docker_ubuntu_repo_base_url }}
- {{ ansible_distribution|lower }}-{{ ansible_distribution_release|lower }}
- main
diff --git a/roles/container-engine/docker/vars/ubuntu-arm64.yml b/roles/container-engine/docker/vars/ubuntu.yml
similarity index 98%
rename from roles/container-engine/docker/vars/ubuntu-arm64.yml
rename to roles/container-engine/docker/vars/ubuntu.yml
index 863d733c8..dbe8ffc38 100644
--- a/roles/container-engine/docker/vars/ubuntu-arm64.yml
+++ b/roles/container-engine/docker/vars/ubuntu.yml
@@ -4,7 +4,6 @@ docker_kernel_min_version: '3.10'
# https://download.docker.com/linux/ubuntu/
docker_versioned_pkg:
'latest': docker-ce
- '17.09': docker-ce=17.09.1~ce-0~ubuntu
'17.12': docker-ce=17.12.1~ce-0~ubuntu-{{ ansible_distribution_release|lower }}
'18.06': docker-ce=18.06.2~ce~3-0~ubuntu
'18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
--
GitLab