feat: use ansible_facts rather than variables

defaults/main.yml

@@ -30,7 +30,7 @@
 # Docker Compose options.
 docker_install_compose: false
 docker_compose_version: "v2.29.2"
-docker_compose_arch: "{{ ansible_architecture }}"
+docker_compose_arch: "{{ ansible_facts.architecture }}"
 docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-linux-{{ docker_compose_arch }}"
 docker_compose_path: /usr/local/bin/docker-compose
 
@@ -44,16 +44,16 @@
 docker_apt_release_channel: stable
 # docker_apt_ansible_distribution is a workaround for Ubuntu variants which can't be identified as such by Ansible,
 # and is only necessary until Docker officially supports them.
-docker_apt_ansible_distribution: "{{ 'ubuntu' if ansible_distribution in ['Pop!_OS', 'Linux Mint'] else ansible_distribution }}"
-docker_apt_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'armhf' if ansible_architecture == 'armv7l' else 'amd64' }}"
+docker_apt_ansible_distribution: "{{ 'ubuntu' if ansible_facts.distribution in ['Pop!_OS', 'Linux Mint'] else ansible_facts.distribution }}"
+docker_apt_arch: "{{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'armhf' if ansible_facts.architecture == 'armv7l' else 'amd64' }}"
 docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/keyrings/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
 docker_apt_ignore_key_error: true
 docker_apt_gpg_key: "{{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }}/gpg"
 docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570"
 docker_apt_filename: "docker"
 
 # Used only for RedHat/CentOS/Fedora.
-docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"
+docker_yum_repo_url: "{{ docker_repo_url }}/{{ (ansible_facts.distribution == 'Fedora') | ternary('fedora','centos') }}/docker-{{ docker_edition }}.repo"
 docker_yum_repo_enable_nightly: '0'
 docker_yum_repo_enable_test: '0'
 docker_yum_gpg_key: "{{ docker_repo_url }}/centos/gpg"

molecule/default/converge.yml

@@ -6,7 +6,7 @@
  pre_tasks:
  - name: Update apt cache.
  apt: update_cache=yes cache_valid_time=600
- when: ansible_os_family == 'Debian'
+ when: ansible_facts.os_family == 'Debian'
 
  - name: Wait for systemd to complete initialization. # noqa 303
  command: systemctl is-system-running
@@ -16,7 +16,7 @@
  'degraded' in systemctl_status.stdout
  retries: 30
  delay: 5
- when: ansible_service_mgr == 'systemd'
+ when: ansible_facts.service_mgr == 'systemd'
  changed_when: false
  failed_when: systemctl_status.rc > 1
 

tasks/main.yml

@@ -4,25 +4,25 @@
  vars:
  params:
  files:
- - '{{ansible_distribution}}.yml'
- - '{{ansible_os_family}}.yml'
+ - '{{ansible_facts.distribution}}.yml'
+ - '{{ansible_facts.os_family}}.yml'
  - main.yml
  paths:
  - 'vars'
 
 - include_tasks: setup-RedHat.yml
- when: ansible_os_family == 'RedHat'
+ when: ansible_facts.os_family == 'RedHat'
 
 - include_tasks: setup-Debian.yml
- when: ansible_os_family == 'Debian'
+ when: ansible_facts.os_family == 'Debian'
 
 - name: Install Docker packages.
  package:
  name: "{{ docker_packages }}"
  state: "{{ docker_packages_state }}"
  notify: restart docker
  ignore_errors: "{{ ansible_check_mode }}"
- when: "ansible_version.full is version_compare('2.12', '<') or ansible_os_family not in ['RedHat', 'Debian']"
+ when: "ansible_version.full is version_compare('2.12', '<') or ansible_facts.os_family not in ['RedHat', 'Debian']"
 
 - name: Install Docker packages (with downgrade option).
  package:
@@ -31,15 +31,15 @@
  allow_downgrade: true
  notify: restart docker
  ignore_errors: "{{ ansible_check_mode }}"
- when: "ansible_version.full is version_compare('2.12', '>=') and ansible_os_family in ['RedHat', 'Debian']"
+ when: "ansible_version.full is version_compare('2.12', '>=') and ansible_facts.os_family in ['RedHat', 'Debian']"
 
 - name: Install docker-compose plugin.
  package:
  name: "{{ docker_compose_package }}"
  state: "{{ docker_compose_package_state }}"
  notify: restart docker
  ignore_errors: "{{ ansible_check_mode }}"
- when: "docker_install_compose_plugin | bool == true and (ansible_version.full is version_compare('2.12', '<') or ansible_os_family not in ['RedHat', 'Debian'])"
+ when: "docker_install_compose_plugin | bool == true and (ansible_version.full is version_compare('2.12', '<') or ansible_facts.os_family not in ['RedHat', 'Debian'])"
 
 - name: Install docker-compose-plugin (with downgrade option).
  package:
@@ -48,7 +48,7 @@
  allow_downgrade: true
  notify: restart docker
  ignore_errors: "{{ ansible_check_mode }}"
- when: "docker_install_compose_plugin | bool == true and ansible_version.full is version_compare('2.12', '>=') and ansible_os_family in ['RedHat', 'Debian']"
+ when: "docker_install_compose_plugin | bool == true and ansible_version.full is version_compare('2.12', '>=') and ansible_facts.os_family in ['RedHat', 'Debian']"
 
 - name: Ensure /etc/docker/ directory exists.
  file:

tasks/setup-Debian.yml

@@ -6,13 +6,13 @@
 
 - name: Ensure the repo referencing the previous trusted.gpg.d key is not present
  apt_repository:
- repo: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}"
+ repo: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ docker_apt_ansible_distribution | lower }} {{ ansible_facts.distribution_release }} {{ docker_apt_release_channel }}"
  state: absent
  filename: "{{ docker_apt_filename }}"
  update_cache: true
  when: docker_add_repo | bool
 
 - # See https://docs.docker.com/engine/install/debian/#uninstall-old-versions
  name: Ensure old versions of Docker are not installed.
  package:
  name: "{{ docker_obsolete_packages }}"
@@ -26,6 +26,12 @@
  state: present
  when: docker_add_repo | bool
 
+- name: Ensure additional dependencies are installed (on Ubuntu >= 20.04).
+ apt:
+ name: gnupg
+ state: present
+ when: ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_version is version('20.04', '>=')
+
 - name: Ensure directory exists for /etc/apt/keyrings
  file:
  path: /etc/apt/keyrings

tasks/setup-RedHat.yml

@@ -58,4 +58,4 @@
  package:
  name: containerd.io
  state: present
- when: ansible_distribution_major_version | int == 8
+ when: ansible_facts.distribution_major_version | int == 8