C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

roles/docker: Make repokey fingerprint overrideable (#7263)

Browse source 
This makes the docker role work the same as the containerd role.
Being able to override this is needed when you have your own debian
repository. E.g. when performing an airgapped installation
This commit is contained in:
Arian van Putten 2021-02-16 05:47:05 +01:00 committed by GitHub
parent d8ab76aa04
commit f8b15a714c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/container-engine/docker/defaults/main.yml
View file

@ -28,9 +28,11 @@ docker_rh_repo_gpgkey: 'https://download.docker.com/linux/centos/gpg'
# Ubuntu docker-ce repo # Ubuntu docker-ce repo
docker_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu" docker_ubuntu_repo_base_url: "https://download.docker.com/linux/ubuntu"
docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg' docker_ubuntu_repo_gpgkey: 'https://download.docker.com/linux/ubuntu/gpg'
docker_ubuntu_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
# Debian docker-ce repo # Debian docker-ce repo
docker_debian_repo_base_url: "https://download.docker.com/linux/debian" docker_debian_repo_base_url: "https://download.docker.com/linux/debian"
docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg' docker_debian_repo_gpgkey: 'https://download.docker.com/linux/debian/gpg'
docker_debian_repo_repokey: '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
docker_bin_dir: "/usr/bin" docker_bin_dir: "/usr/bin"
# flag to enable/disable docker cleanup # flag to enable/disable docker cleanup

2
roles/container-engine/docker/vars/debian.yml
View file

@ -23,7 +23,7 @@ docker_package_info:
docker_repo_key_info: docker_repo_key_info:
url: '{{ docker_debian_repo_gpgkey }}' url: '{{ docker_debian_repo_gpgkey }}'
repo_keys: repo_keys:
- 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 - '{{ docker_debian_repo_repokey }}'
docker_repo_info: docker_repo_info:
repos: repos:

2
roles/container-engine/docker/vars/ubuntu.yml
View file

@ -23,7 +23,7 @@ docker_package_info:
docker_repo_key_info: docker_repo_key_info:
url: '{{ docker_ubuntu_repo_gpgkey }}' url: '{{ docker_ubuntu_repo_gpgkey }}'
repo_keys: repo_keys:
- 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 - '{{ docker_ubuntu_repo_repokey }}'
docker_repo_info: docker_repo_info:
repos: repos: