From 48688d0fafa3003b90f72ab6a9ac78bd5c8b6e2c Mon Sep 17 00:00:00 2001 From: Dale Anderson Date: Fri, 30 Dec 2022 15:17:35 -0800 Subject: [PATCH] Handle the exception more cleanly --- defaults/main.yml | 5 +++-- vars/Pop!_OS.yml | 13 ------------- 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 vars/Pop!_OS.yml diff --git a/defaults/main.yml b/defaults/main.yml index 685b8de..6f3fd6f 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,10 +31,11 @@ docker_repo_url: https://download.docker.com/linux # Used only for Debian/Ubuntu. Switch 'stable' to 'nightly' if needed. docker_apt_release_channel: stable +docker_apt_ansible_distro_name: "{{ 'ubuntu' if ansible_distribution == 'Pop!_OS' else ansible_distribution }}" docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}" -docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/{{ docker_apt_ansible_distro_name | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" docker_apt_ignore_key_error: true -docker_apt_gpg_key: "{{ docker_repo_url }}/{{ ansible_distribution | lower }}/gpg" +docker_apt_gpg_key: "{{ docker_repo_url }}/{{ docker_apt_ansible_distro_name | lower }}/gpg" # Used only for RedHat/CentOS/Fedora. docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo" diff --git a/vars/Pop!_OS.yml b/vars/Pop!_OS.yml deleted file mode 100644 index 805a36b..0000000 --- a/vars/Pop!_OS.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Since: -# * `ansible_distribution` evaluates to Pop!_OS, and -# * docker does not (yet) support Pop!_OS, and -# * Pop_OS is effectively Ubuntu (for our purposes), and -# * There isn't a 'better' variable we easily use -# we need to just wire in 'ubuntu' instead of relying on `ansible_distribution`. - -# If "https://download.docker.com/linux/pop!_os/gpg" ever exists, this can be removed. -docker_apt_gpg_key: "{{ docker_repo_url }}/ubuntu/gpg" - -# If "https://download.docker.com/linux/pop!_os/....." ever exists, this can be removed. -docker_apt_repository: "deb [arch={{ docker_apt_arch }}] {{ docker_repo_url }}/ubuntu {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"