From 18f51bd2e3ee9b3e2c5a145d971b050dafb43bc5 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Thu, 7 Sep 2023 12:15:06 +0100 Subject: [PATCH] feat: use `ansible_facts` rather than `variables` --- defaults/main.yml | 10 +++++----- molecule/default/converge.yml | 4 ++-- tasks/main.yml | 16 ++++++++-------- tasks/setup-Debian.yml | 4 ++-- tasks/setup-RedHat.yml | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 26e2764..9d009fd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,7 +22,7 @@ docker_compose_package_state: present # Docker Compose options. docker_install_compose: true docker_compose_version: "v2.11.1" -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 @@ -34,14 +34,14 @@ 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_arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}" -docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" +docker_apt_arch: "{{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }}" +docker_apt_repository: "deb [arch={{ docker_apt_arch }} signed-by=/etc/apt/trusted.gpg.d/docker.asc] {{ docker_repo_url }}/{{ ansible_facts.distribution | lower }} {{ ansible_facts.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 }}/{{ ansible_facts.distribution | lower }}/gpg" docker_apt_gpg_key_checksum: "sha256:1500c1f56fa9e26b9b8f42452a553675796ade0807cdce11975eb98170b3a570" # 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" diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 629095b..e881695 100644 --- a/molecule/default/converge.yml +++ b/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 diff --git a/tasks/main.yml b/tasks/main.yml index dcd47de..ab0eacd 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -4,17 +4,17 @@ 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: @@ -22,7 +22,7 @@ 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,7 +31,7 @@ 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: @@ -39,7 +39,7 @@ 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: diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 55c8e62..8e1c5b9 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -18,13 +18,13 @@ apt: name: gnupg2 state: present - when: ansible_distribution != 'Ubuntu' or ansible_distribution_version is version('20.04', '<') + when: ansible_facts.distribution != 'Ubuntu' or ansible_facts.distribution_version is version('20.04', '<') - name: Ensure additional dependencies are installed (on Ubuntu >= 20.04). apt: name: gnupg state: present - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('20.04', '>=') + when: ansible_facts.distribution == 'Ubuntu' and ansible_facts.distribution_version is version('20.04', '>=') - name: Add Docker apt key. ansible.builtin.get_url: diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index ad337c4..d65635f 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -53,4 +53,4 @@ package: name: containerd.io state: present - when: ansible_distribution_major_version | int == 8 + when: ansible_facts.distribution_major_version | int == 8