From 85a3c811cb84eaf3f81808f6156767d9ea0a55a4 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Sat, 7 Feb 2026 16:00:22 +0100 Subject: [PATCH] Use ansible_facts.xxx instead of ansible_xxx. (#1237) --- .../integration/targets/docker_config/tasks/main.yml | 2 +- .../docker_config/tasks/test_docker_config.yml | 2 +- .../targets/docker_container/tasks/main.yml | 2 +- .../docker_container_copy_into/tasks/main.yml | 2 +- .../targets/docker_container_exec/tasks/main.yml | 2 +- .../targets/docker_container_info/tasks/main.yml | 2 +- .../targets/docker_context_info/tasks/main.yml | 2 +- .../targets/docker_host_info/tasks/main.yml | 2 +- .../integration/targets/docker_image/tasks/test.yml | 2 +- .../targets/docker_image_build/tasks/test.yml | 2 +- .../targets/docker_image_export/tasks/test.yml | 2 +- .../targets/docker_image_info/tasks/main.yml | 2 +- .../targets/docker_image_load/tasks/test.yml | 2 +- .../targets/docker_image_pull/tasks/test.yml | 2 +- .../targets/docker_image_push/tasks/test.yml | 2 +- .../targets/docker_image_remove/tasks/main.yml | 2 +- .../targets/docker_image_tag/tasks/main.yml | 2 +- .../integration/targets/docker_login/tasks/test.yml | 2 +- .../targets/docker_network/tasks/main.yml | 2 +- .../targets/docker_network/tasks/tests/ipam.yml | 10 +++++----- .../targets/docker_network/tasks/tests/options.yml | 2 +- .../targets/docker_network/tasks/tests/overlay.yml | 2 +- .../targets/docker_network_info/tasks/main.yml | 2 +- tests/integration/targets/docker_node/tasks/main.yml | 2 +- .../targets/docker_node/tasks/test_node.yml | 2 +- .../targets/docker_node_info/tasks/main.yml | 2 +- .../docker_node_info/tasks/test_node_info.yml | 2 +- .../integration/targets/docker_plugin/tasks/main.yml | 2 +- .../integration/targets/docker_prune/tasks/main.yml | 2 +- .../integration/targets/docker_secret/tasks/main.yml | 2 +- .../targets/docker_secret/tasks/test_secrets.yml | 2 +- .../integration/targets/docker_stack/tasks/main.yml | 2 +- .../targets/docker_stack/tasks/test_stack.yml | 2 +- .../targets/docker_stack_info/tasks/main.yml | 2 +- .../docker_stack_info/tasks/test_stack_info.yml | 2 +- .../targets/docker_stack_task_info/tasks/main.yml | 2 +- .../tasks/test_stack_task_info.yml | 2 +- .../integration/targets/docker_swarm/tasks/main.yml | 2 +- .../targets/docker_swarm/tasks/tests/basic.yml | 12 ++++++------ .../targets/docker_swarm/tasks/tests/options-ca.yml | 4 ++-- .../targets/docker_swarm/tasks/tests/options.yml | 4 ++-- .../targets/docker_swarm_info/tasks/main.yml | 2 +- .../docker_swarm_info/tasks/test_swarm_info.yml | 4 ++-- .../targets/docker_swarm_service/tasks/main.yml | 4 ++-- .../targets/docker_swarm_service_info/tasks/main.yml | 2 +- .../tasks/test_docker_swarm_service_info.yml | 4 ++-- .../integration/targets/docker_volume/tasks/main.yml | 2 +- .../targets/docker_volume_info/tasks/main.yml | 2 +- .../inventory_docker_swarm/playbooks/swarm_setup.yml | 2 +- .../targets/setup_docker/tasks/Debian.yml | 8 ++++---- .../targets/setup_docker/tasks/RedHat-10.yml | 2 +- .../targets/setup_docker/tasks/RedHat-7.yml | 2 +- .../targets/setup_docker/tasks/RedHat-8.yml | 2 +- .../targets/setup_docker/tasks/RedHat-9.yml | 2 +- .../integration/targets/setup_docker/tasks/main.yml | 4 ++-- .../targets/setup_docker_compose_v2/tasks/main.yml | 2 +- .../tasks/main.yml | 6 +++--- .../targets/setup_docker_registry/tasks/setup.yml | 2 +- .../setup_docker_sdk_for_python/tasks/main.yml | 2 +- tests/integration/targets/setup_epel/tasks/main.yml | 2 +- .../integration/targets/setup_openssl/tasks/main.yml | 10 +++++----- .../targets/setup_paramiko/tasks/main.yml | 2 +- .../integration/targets/setup_pkg_mgr/tasks/main.yml | 8 ++++---- .../integration/targets/setup_podman/tasks/main.yml | 6 +++--- .../targets/setup_remote_tmp_dir/tasks/main.yml | 4 ++-- 65 files changed, 95 insertions(+), 95 deletions(-) diff --git a/tests/integration/targets/docker_config/tasks/main.yml b/tests/integration/targets/docker_config/tasks/main.yml index a30c80c8..45664631 100644 --- a/tests/integration/targets/docker_config/tasks/main.yml +++ b/tests/integration/targets/docker_config/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.30', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_config tests!" - when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.30', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.6.0', '>=') and docker_api_version is version('1.30', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_config/tasks/test_docker_config.yml b/tests/integration/targets/docker_config/tasks/test_docker_config.yml index f22ed37f..4fd67d0d 100644 --- a/tests/integration/targets/docker_config/tasks/test_docker_config.yml +++ b/tests/integration/targets/docker_config/tasks/test_docker_config.yml @@ -17,7 +17,7 @@ community.docker.docker_swarm: name: default state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" - name: Parameter name should be required community.docker.docker_config: # noqa: args[module] diff --git a/tests/integration/targets/docker_container/tasks/main.yml b/tests/integration/targets/docker_container/tasks/main.yml index 2717a635..5170fef1 100644 --- a/tests/integration/targets/docker_container/tasks/main.yml +++ b/tests/integration/targets/docker_container/tasks/main.yml @@ -70,4 +70,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run all docker_container tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_container_copy_into/tasks/main.yml b/tests/integration/targets/docker_container_copy_into/tasks/main.yml index 7c43f18a..5b47c033 100644 --- a/tests/integration/targets/docker_container_copy_into/tasks/main.yml +++ b/tests/integration/targets/docker_container_copy_into/tasks/main.yml @@ -44,4 +44,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old Docker API version to run all docker_container_copy_into tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_container_exec/tasks/main.yml b/tests/integration/targets/docker_container_exec/tasks/main.yml index 0b83a5ad..39e7eee5 100644 --- a/tests/integration/targets/docker_container_exec/tasks/main.yml +++ b/tests/integration/targets/docker_container_exec/tasks/main.yml @@ -243,4 +243,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_container_exec tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_container_info/tasks/main.yml b/tests/integration/targets/docker_container_info/tasks/main.yml index 797b42f8..719f6884 100644 --- a/tests/integration/targets/docker_container_info/tasks/main.yml +++ b/tests/integration/targets/docker_container_info/tasks/main.yml @@ -81,4 +81,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_container_info tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_context_info/tasks/main.yml b/tests/integration/targets/docker_context_info/tasks/main.yml index 87c415ad..39b8d2f6 100644 --- a/tests/integration/targets/docker_context_info/tasks/main.yml +++ b/tests/integration/targets/docker_context_info/tasks/main.yml @@ -37,4 +37,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run all docker_container tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_host_info/tasks/main.yml b/tests/integration/targets/docker_host_info/tasks/main.yml index 9ec9a7d9..c72ec456 100644 --- a/tests/integration/targets/docker_host_info/tasks/main.yml +++ b/tests/integration/targets/docker_host_info/tasks/main.yml @@ -12,7 +12,7 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_host_info tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) - when: podman_cli_version is version('1.0.0', '>=') block: diff --git a/tests/integration/targets/docker_image/tasks/test.yml b/tests/integration/targets/docker_image/tasks/test.yml index 4f086c1c..e9d37557 100644 --- a/tests/integration/targets/docker_image/tasks/test.yml +++ b/tests/integration/targets/docker_image/tasks/test.yml @@ -53,4 +53,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_image_build/tasks/test.yml b/tests/integration/targets/docker_image_build/tasks/test.yml index 6df5fddc..de325090 100644 --- a/tests/integration/targets/docker_image_build/tasks/test.yml +++ b/tests/integration/targets/docker_image_build/tasks/test.yml @@ -68,4 +68,4 @@ when: docker_api_version is version('1.25', '>=') and docker_cli_version is version('19.03', '>=') and docker_has_buildx - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!" - when: not(docker_api_version is version('1.25', '>=') and docker_cli_version is version('19.03', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) and docker_has_buildx + when: not(docker_api_version is version('1.25', '>=') and docker_cli_version is version('19.03', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) and docker_has_buildx diff --git a/tests/integration/targets/docker_image_export/tasks/test.yml b/tests/integration/targets/docker_image_export/tasks/test.yml index 63f8c04c..b6f8efda 100644 --- a/tests/integration/targets/docker_image_export/tasks/test.yml +++ b/tests/integration/targets/docker_image_export/tasks/test.yml @@ -36,4 +36,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_image_info/tasks/main.yml b/tests/integration/targets/docker_image_info/tasks/main.yml index ca189363..87af4c59 100644 --- a/tests/integration/targets/docker_image_info/tasks/main.yml +++ b/tests/integration/targets/docker_image_info/tasks/main.yml @@ -57,4 +57,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image_info tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_image_load/tasks/test.yml b/tests/integration/targets/docker_image_load/tasks/test.yml index 63f8c04c..b6f8efda 100644 --- a/tests/integration/targets/docker_image_load/tasks/test.yml +++ b/tests/integration/targets/docker_image_load/tasks/test.yml @@ -36,4 +36,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_image_pull/tasks/test.yml b/tests/integration/targets/docker_image_pull/tasks/test.yml index 63f8c04c..b6f8efda 100644 --- a/tests/integration/targets/docker_image_pull/tasks/test.yml +++ b/tests/integration/targets/docker_image_pull/tasks/test.yml @@ -36,4 +36,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_image_push/tasks/test.yml b/tests/integration/targets/docker_image_push/tasks/test.yml index 63f8c04c..b6f8efda 100644 --- a/tests/integration/targets/docker_image_push/tasks/test.yml +++ b/tests/integration/targets/docker_image_push/tasks/test.yml @@ -36,4 +36,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_image_remove/tasks/main.yml b/tests/integration/targets/docker_image_remove/tasks/main.yml index 1a9df982..b2626d5f 100644 --- a/tests/integration/targets/docker_image_remove/tasks/main.yml +++ b/tests/integration/targets/docker_image_remove/tasks/main.yml @@ -303,4 +303,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image_info tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_image_tag/tasks/main.yml b/tests/integration/targets/docker_image_tag/tasks/main.yml index 39ec2cb3..2c841454 100644 --- a/tests/integration/targets/docker_image_tag/tasks/main.yml +++ b/tests/integration/targets/docker_image_tag/tasks/main.yml @@ -399,4 +399,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image_info tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_login/tasks/test.yml b/tests/integration/targets/docker_login/tasks/test.yml index be366f53..42e783d5 100644 --- a/tests/integration/targets/docker_login/tasks/test.yml +++ b/tests/integration/targets/docker_login/tasks/test.yml @@ -12,4 +12,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_image tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_network/tasks/main.yml b/tests/integration/targets/docker_network/tasks/main.yml index 7627af20..313b57d3 100644 --- a/tests/integration/targets/docker_network/tasks/main.yml +++ b/tests/integration/targets/docker_network/tasks/main.yml @@ -51,4 +51,4 @@ when: docker_api_version is version('1.25', '>=') # FIXME: find out API version! - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_network tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_network/tasks/tests/ipam.yml b/tests/integration/targets/docker_network/tasks/tests/ipam.yml index a3e0ffd0..fe301bf3 100644 --- a/tests/integration/targets/docker_network/tasks/tests/ipam.yml +++ b/tests/integration/targets/docker_network/tasks/tests/ipam.yml @@ -205,7 +205,7 @@ name: "{{ nname_ipam_3 }}" driver: "macvlan" driver_options: - parent: "{{ ansible_default_ipv4.alias }}" + parent: "{{ ansible_facts.default_ipv4.alias }}" ipam_config: - subnet: 10.26.120.0/24 - subnet: 10.26.121.0/24 @@ -220,7 +220,7 @@ name: "{{ nname_ipam_3 }}" driver: "macvlan" driver_options: - parent: "{{ ansible_default_ipv4.alias }}" + parent: "{{ ansible_facts.default_ipv4.alias }}" ipam_config: - subnet: 10.26.121.0/24 - subnet: 10.26.120.0/24 @@ -235,7 +235,7 @@ name: "{{ nname_ipam_3 }}" driver: "macvlan" driver_options: - parent: "{{ ansible_default_ipv4.alias }}" + parent: "{{ ansible_facts.default_ipv4.alias }}" ipam_config: - subnet: 10.26.120.0/24 - subnet: 10.26.122.0/24 @@ -252,7 +252,7 @@ name: "{{ nname_ipam_3 }}" driver: "macvlan" driver_options: - parent: "{{ ansible_default_ipv4.alias }}" + parent: "{{ ansible_facts.default_ipv4.alias }}" ipam_config: - subnet: 10.26.122.0/24 register: network @@ -266,7 +266,7 @@ name: "{{ nname_ipam_3 }}" state: absent - when: ansible_facts.virtualization_type != 'docker' and ansible_default_ipv4.alias is defined + when: ansible_facts.virtualization_type != 'docker' and ansible_facts.default_ipv4.alias is defined #################### IPAM driver options #################### diff --git a/tests/integration/targets/docker_network/tasks/tests/options.yml b/tests/integration/targets/docker_network/tasks/tests/options.yml index c21b7e5b..f55b7866 100644 --- a/tests/integration/targets/docker_network/tasks/tests/options.yml +++ b/tests/integration/targets/docker_network/tasks/tests/options.yml @@ -119,7 +119,7 @@ - name: swarm community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" # Driver change alongside scope is intentional - bridge doesn't appear to support anything but local, and overlay can't downgrade to local. Additionally, overlay reports as swarm for swarm OR global, so no change is reported in that case. # Test output indicates that the scope is altered, at least, so manual inspection will be required to verify this going forward, unless we come up with a test driver that supports multiple scopes. diff --git a/tests/integration/targets/docker_network/tasks/tests/overlay.yml b/tests/integration/targets/docker_network/tasks/tests/overlay.yml index e0cd01bd..ab3354ba 100644 --- a/tests/integration/targets/docker_network/tasks/tests/overlay.yml +++ b/tests/integration/targets/docker_network/tasks/tests/overlay.yml @@ -15,7 +15,7 @@ - name: swarm community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" #################################################################### ## overlay ######################################################### diff --git a/tests/integration/targets/docker_network_info/tasks/main.yml b/tests/integration/targets/docker_network_info/tasks/main.yml index 29e64a80..6c9a9993 100644 --- a/tests/integration/targets/docker_network_info/tasks/main.yml +++ b/tests/integration/targets/docker_network_info/tasks/main.yml @@ -77,4 +77,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_network_info tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_node/tasks/main.yml b/tests/integration/targets/docker_node/tasks/main.yml index 4fa9d061..d9fa4f3f 100644 --- a/tests/integration/targets/docker_node/tasks/main.yml +++ b/tests/integration/targets/docker_node/tasks/main.yml @@ -38,4 +38,4 @@ when: docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_node tests!" - when: not(docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_node/tasks/test_node.yml b/tests/integration/targets/docker_node/tasks/test_node.yml index dda9be34..01258f04 100644 --- a/tests/integration/targets/docker_node/tasks/test_node.yml +++ b/tests/integration/targets/docker_node/tasks/test_node.yml @@ -23,7 +23,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" register: output - name: assert changed when create a new swarm cluster diff --git a/tests/integration/targets/docker_node_info/tasks/main.yml b/tests/integration/targets/docker_node_info/tasks/main.yml index 872273d0..ebe7d53f 100644 --- a/tests/integration/targets/docker_node_info/tasks/main.yml +++ b/tests/integration/targets/docker_node_info/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_node_info tests!" - when: not(docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.4.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_node_info/tasks/test_node_info.yml b/tests/integration/targets/docker_node_info/tasks/test_node_info.yml index 8a6e5e55..07b32f69 100644 --- a/tests/integration/targets/docker_node_info/tasks/test_node_info.yml +++ b/tests/integration/targets/docker_node_info/tasks/test_node_info.yml @@ -23,7 +23,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" register: output - name: assert changed when create a new swarm cluster diff --git a/tests/integration/targets/docker_plugin/tasks/main.yml b/tests/integration/targets/docker_plugin/tasks/main.yml index 5d20c8a3..efa0c50c 100644 --- a/tests/integration/targets/docker_plugin/tasks/main.yml +++ b/tests/integration/targets/docker_plugin/tasks/main.yml @@ -33,4 +33,4 @@ when: docker_api_version is version('1.25', '>=') and dev_fuse_stat.stat.exists - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_plugin tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_prune/tasks/main.yml b/tests/integration/targets/docker_prune/tasks/main.yml index 33358766..24661489 100644 --- a/tests/integration/targets/docker_prune/tasks/main.yml +++ b/tests/integration/targets/docker_prune/tasks/main.yml @@ -172,4 +172,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_prune tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_secret/tasks/main.yml b/tests/integration/targets/docker_secret/tasks/main.yml index 7d222a3d..b4799dad 100644 --- a/tests/integration/targets/docker_secret/tasks/main.yml +++ b/tests/integration/targets/docker_secret/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_py_version is version('2.1.0', '>=') and docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_secrets tests!" - when: not(docker_py_version is version('2.1.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.1.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_secret/tasks/test_secrets.yml b/tests/integration/targets/docker_secret/tasks/test_secrets.yml index 6cf163c0..ea264868 100644 --- a/tests/integration/targets/docker_secret/tasks/test_secrets.yml +++ b/tests/integration/targets/docker_secret/tasks/test_secrets.yml @@ -12,7 +12,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" - name: Parameter name should be required community.docker.docker_secret: # noqa: args[module] diff --git a/tests/integration/targets/docker_stack/tasks/main.yml b/tests/integration/targets/docker_stack/tasks/main.yml index 86570b3e..ad2e57af 100644 --- a/tests/integration/targets/docker_stack/tasks/main.yml +++ b/tests/integration/targets/docker_stack/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_stack tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_stack/tasks/test_stack.yml b/tests/integration/targets/docker_stack/tasks/test_stack.yml index 7365bc4f..b4634455 100644 --- a/tests/integration/targets/docker_stack/tasks/test_stack.yml +++ b/tests/integration/targets/docker_stack/tasks/test_stack.yml @@ -12,7 +12,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" - name: install docker_stack python requirements ansible.builtin.pip: diff --git a/tests/integration/targets/docker_stack_info/tasks/main.yml b/tests/integration/targets/docker_stack_info/tasks/main.yml index 3dab37da..f59380d0 100644 --- a/tests/integration/targets/docker_stack_info/tasks/main.yml +++ b/tests/integration/targets/docker_stack_info/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_stack tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_stack_info/tasks/test_stack_info.yml b/tests/integration/targets/docker_stack_info/tasks/test_stack_info.yml index a2d4c61e..24835607 100644 --- a/tests/integration/targets/docker_stack_info/tasks/test_stack_info.yml +++ b/tests/integration/targets/docker_stack_info/tasks/test_stack_info.yml @@ -23,7 +23,7 @@ - name: Create a swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" - name: Get docker_stack_info when docker is running and not stack available community.docker.docker_stack_info: diff --git a/tests/integration/targets/docker_stack_task_info/tasks/main.yml b/tests/integration/targets/docker_stack_task_info/tasks/main.yml index e401421f..3b9a088c 100644 --- a/tests/integration/targets/docker_stack_task_info/tasks/main.yml +++ b/tests/integration/targets/docker_stack_task_info/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_stack tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_stack_task_info/tasks/test_stack_task_info.yml b/tests/integration/targets/docker_stack_task_info/tasks/test_stack_task_info.yml index 46dd1e43..7186a678 100644 --- a/tests/integration/targets/docker_stack_task_info/tasks/test_stack_task_info.yml +++ b/tests/integration/targets/docker_stack_task_info/tasks/test_stack_task_info.yml @@ -23,7 +23,7 @@ - name: Create a swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" - name: Get docker_stack_info when docker is running and not stack available community.docker.docker_stack_info: diff --git a/tests/integration/targets/docker_swarm/tasks/main.yml b/tests/integration/targets/docker_swarm/tasks/main.yml index cf08537a..575e1ba1 100644 --- a/tests/integration/targets/docker_swarm/tasks/main.yml +++ b/tests/integration/targets/docker_swarm/tasks/main.yml @@ -27,4 +27,4 @@ msg: "Too old docker / docker-py version to run docker_swarm tests!" when: - not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) - - (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + - (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml index 46e2a25f..777b3aa5 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/basic.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/basic.yml @@ -40,7 +40,7 @@ - name: Create a Swarm cluster (check mode) community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" check_mode: true diff: true register: output_1 @@ -48,21 +48,21 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" diff: true register: output_2 - name: Create a Swarm cluster (idempotent) community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" diff: true register: output_3 - name: Create a Swarm cluster (idempotent, check mode) community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" check_mode: true diff: true register: output_4 @@ -70,7 +70,7 @@ - name: Create a Swarm cluster (force re-create) community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" force: true diff: true register: output_5 @@ -78,7 +78,7 @@ - name: Create a Swarm cluster (force re-create, check mode) community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" force: true check_mode: true diff: true diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml index c965162b..823d1593 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options-ca.yml @@ -58,7 +58,7 @@ register: ansible_keys - name: signing_ca_cert and signing_ca_key (check mode) community.docker.docker_swarm: - advertise_addr: '{{ ansible_default_ipv4.address | default("127.0.0.1") }}' + advertise_addr: '{{ ansible_facts.default_ipv4.address | default("127.0.0.1") }}' state: present signing_ca_cert: '{{ ansible_certificates.results[0].content | b64decode }}' signing_ca_key: '{{ ansible_keys.results[0].content | b64decode }}' @@ -69,7 +69,7 @@ ignore_errors: true - name: signing_ca_cert and signing_ca_key community.docker.docker_swarm: - advertise_addr: '{{ ansible_default_ipv4.address | default("127.0.0.1") }}' + advertise_addr: '{{ ansible_facts.default_ipv4.address | default("127.0.0.1") }}' state: present signing_ca_cert: '{{ ansible_certificates.results[0].content | b64decode }}' signing_ca_key: '{{ ansible_keys.results[0].content | b64decode }}' diff --git a/tests/integration/targets/docker_swarm/tasks/tests/options.yml b/tests/integration/targets/docker_swarm/tasks/tests/options.yml index 98fe693d..be4e452f 100644 --- a/tests/integration/targets/docker_swarm/tasks/tests/options.yml +++ b/tests/integration/targets/docker_swarm/tasks/tests/options.yml @@ -9,7 +9,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" name: default diff: true @@ -72,7 +72,7 @@ community.docker.docker_swarm: state: present force: true - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" autolock_managers: true diff: true register: output_7 diff --git a/tests/integration/targets/docker_swarm_info/tasks/main.yml b/tests/integration/targets/docker_swarm_info/tasks/main.yml index c0886a23..8aacddf1 100644 --- a/tests/integration/targets/docker_swarm_info/tasks/main.yml +++ b/tests/integration/targets/docker_swarm_info/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_swarm_info tests!" - when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml b/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml index c9bb82dd..df7fe2da 100644 --- a/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml +++ b/tests/integration/targets/docker_swarm_info/tasks/test_swarm_info.yml @@ -27,7 +27,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" register: output - name: assert changed when create a new swarm cluster @@ -160,7 +160,7 @@ - name: Update swarm cluster to be locked community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" autolock_managers: true register: autolock_managers_update_output ignore_errors: true diff --git a/tests/integration/targets/docker_swarm_service/tasks/main.yml b/tests/integration/targets/docker_swarm_service/tasks/main.yml index ee966686..838c8125 100644 --- a/tests/integration/targets/docker_swarm_service/tasks/main.yml +++ b/tests/integration/targets/docker_swarm_service/tasks/main.yml @@ -27,7 +27,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" - ansible.builtin.include_tasks: run-test.yml with_fileglob: @@ -82,4 +82,4 @@ when: docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_swarm_service tests!" - when: not(docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_swarm_service_info/tasks/main.yml b/tests/integration/targets/docker_swarm_service_info/tasks/main.yml index f7cfcb46..e4291f6f 100644 --- a/tests/integration/targets/docker_swarm_service_info/tasks/main.yml +++ b/tests/integration/targets/docker_swarm_service_info/tasks/main.yml @@ -12,4 +12,4 @@ when: docker_py_version is version('2.0.0', '>=') and docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_swarm_service_info tests!" - when: not(docker_py_version is version('2.0.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.0.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml b/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml index 6a69940d..575c9a6f 100644 --- a/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml +++ b/tests/integration/targets/docker_swarm_service_info/tasks/test_docker_swarm_service_info.yml @@ -32,7 +32,7 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" register: output - name: Create services @@ -82,4 +82,4 @@ when: docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_swarm_service_info tests!" - when: not(docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_py_version is version('2.0.2', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_volume/tasks/main.yml b/tests/integration/targets/docker_volume/tasks/main.yml index 48345999..d67eb3fc 100644 --- a/tests/integration/targets/docker_volume/tasks/main.yml +++ b/tests/integration/targets/docker_volume/tasks/main.yml @@ -33,4 +33,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_volume tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/docker_volume_info/tasks/main.yml b/tests/integration/targets/docker_volume_info/tasks/main.yml index 1af98db6..abea054e 100644 --- a/tests/integration/targets/docker_volume_info/tasks/main.yml +++ b/tests/integration/targets/docker_volume_info/tasks/main.yml @@ -74,4 +74,4 @@ when: docker_api_version is version('1.25', '>=') - ansible.builtin.fail: msg="Too old docker / docker-py version to run docker_volume_info tests!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) diff --git a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml index be1216f4..aaf155d6 100644 --- a/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml +++ b/tests/integration/targets/inventory_docker_swarm/playbooks/swarm_setup.yml @@ -20,4 +20,4 @@ - name: Create a Swarm cluster community.docker.docker_swarm: state: present - advertise_addr: "{{ ansible_default_ipv4.address | default('127.0.0.1') }}" + advertise_addr: "{{ ansible_facts.default_ipv4.address | default('127.0.0.1') }}" diff --git a/tests/integration/targets/setup_docker/tasks/Debian.yml b/tests/integration/targets/setup_docker/tasks/Debian.yml index 0f9bc958..5958dbd5 100644 --- a/tests/integration/targets/setup_docker/tasks/Debian.yml +++ b/tests/integration/targets/setup_docker/tasks/Debian.yml @@ -21,12 +21,12 @@ block: - name: Add gpg key ansible.builtin.get_url: - url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" + url: "https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg" dest: /etc/apt/keyrings/docker.asc - name: Add Docker repo ansible.builtin.apt_repository: - repo: deb [arch={{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable + repo: deb [arch={{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_facts.distribution | lower }} {{ ansible_facts.distribution_release }} stable state: present - when: @@ -35,11 +35,11 @@ name: Add Docker repo on Ubuntu 20 or before, or Debian 11 or before block: - name: Add gpg key - ansible.builtin.shell: curl -fsSL https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg >key && apt-key add key # noqa: command-instead-of-module + ansible.builtin.shell: curl -fsSL https://download.docker.com/linux/{{ ansible_facts.distribution | lower }}/gpg >key && apt-key add key # noqa: command-instead-of-module - name: Add Docker repo ansible.builtin.apt_repository: - repo: deb [arch={{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable + repo: deb [arch={{ 'arm64' if ansible_facts.architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/{{ ansible_facts.distribution | lower }} {{ ansible_facts.distribution_release }} stable state: present - block: diff --git a/tests/integration/targets/setup_docker/tasks/RedHat-10.yml b/tests/integration/targets/setup_docker/tasks/RedHat-10.yml index 24386bad..867868b5 100644 --- a/tests/integration/targets/setup_docker/tasks/RedHat-10.yml +++ b/tests/integration/targets/setup_docker/tasks/RedHat-10.yml @@ -35,5 +35,5 @@ ansible.builtin.service: name: docker state: started - ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}" + ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}" when: needs_docker_daemon diff --git a/tests/integration/targets/setup_docker/tasks/RedHat-7.yml b/tests/integration/targets/setup_docker/tasks/RedHat-7.yml index b4315b12..8ca4ab0d 100644 --- a/tests/integration/targets/setup_docker/tasks/RedHat-7.yml +++ b/tests/integration/targets/setup_docker/tasks/RedHat-7.yml @@ -42,5 +42,5 @@ ansible.builtin.service: name: docker state: started - ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}" + ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}" when: needs_docker_daemon diff --git a/tests/integration/targets/setup_docker/tasks/RedHat-8.yml b/tests/integration/targets/setup_docker/tasks/RedHat-8.yml index 2550888b..119def8a 100644 --- a/tests/integration/targets/setup_docker/tasks/RedHat-8.yml +++ b/tests/integration/targets/setup_docker/tasks/RedHat-8.yml @@ -35,5 +35,5 @@ ansible.builtin.service: name: docker state: started - ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}" + ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}" when: needs_docker_daemon diff --git a/tests/integration/targets/setup_docker/tasks/RedHat-9.yml b/tests/integration/targets/setup_docker/tasks/RedHat-9.yml index 2550888b..119def8a 100644 --- a/tests/integration/targets/setup_docker/tasks/RedHat-9.yml +++ b/tests/integration/targets/setup_docker/tasks/RedHat-9.yml @@ -35,5 +35,5 @@ ansible.builtin.service: name: docker state: started - ignore_errors: "{{ ansible_virtualization_type in ['docker', 'container', 'containerd'] }}" + ignore_errors: "{{ ansible_facts.virtualization_type in ['docker', 'container', 'containerd'] }}" when: needs_docker_daemon diff --git a/tests/integration/targets/setup_docker/tasks/main.yml b/tests/integration/targets/setup_docker/tasks/main.yml index bef9f1a2..55a007ae 100644 --- a/tests/integration/targets/setup_docker/tasks/main.yml +++ b/tests/integration/targets/setup_docker/tasks/main.yml @@ -23,7 +23,7 @@ block: - name: Determine whether Docker Daemon needs to be installed ansible.builtin.set_fact: - needs_docker_daemon: '{{ not ansible_module_running_in_container }}' + needs_docker_daemon: '{{ not ansible_facts.module_running_in_container }}' - name: Print information ansible.builtin.debug: @@ -62,7 +62,7 @@ ansible.builtin.service: name: docker state: started - when: not ansible_module_running_in_container + when: not ansible_facts.module_running_in_container - name: Set marker that Docker was already set up ansible.builtin.file: diff --git a/tests/integration/targets/setup_docker_compose_v2/tasks/main.yml b/tests/integration/targets/setup_docker_compose_v2/tasks/main.yml index 307d6cb0..544c21d1 100644 --- a/tests/integration/targets/setup_docker_compose_v2/tasks/main.yml +++ b/tests/integration/targets/setup_docker_compose_v2/tasks/main.yml @@ -11,6 +11,6 @@ - ansible.builtin.set_fact: has_docker_compose: false -- when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in ['CentOS6', 'RedHat6'] and ansible_python_version is version('3.7', '>=') +- when: ansible_facts.distribution ~ ansible_facts.distribution_major_version not in ['CentOS6', 'RedHat6'] and ansible_facts.python_version is version('3.7', '>=') ansible.builtin.include_tasks: file: setup.yml diff --git a/tests/integration/targets/setup_docker_current_container_network_ip/tasks/main.yml b/tests/integration/targets/setup_docker_current_container_network_ip/tasks/main.yml index 7e7ffcdd..36fc680a 100644 --- a/tests/integration/targets/setup_docker_current_container_network_ip/tasks/main.yml +++ b/tests/integration/targets/setup_docker_current_container_network_ip/tasks/main.yml @@ -16,10 +16,10 @@ - name: Inspect current container community.docker.docker_container_info: - name: "{{ ansible_module_container_id }}" + name: "{{ ansible_facts.module_container_id }}" register: current_container_info - when: ansible_module_running_in_container + when: ansible_facts.module_running_in_container - name: Determine network name ansible.builtin.set_fact: - current_container_network_ip: "{{ (current_container_info.container.NetworkSettings.Networks | dictsort)[0].0 | default('') if ansible_module_running_in_container else '' }}" + current_container_network_ip: "{{ (current_container_info.container.NetworkSettings.Networks | dictsort)[0].0 | default('') if ansible_facts.module_running_in_container else '' }}" diff --git a/tests/integration/targets/setup_docker_registry/tasks/setup.yml b/tests/integration/targets/setup_docker_registry/tasks/setup.yml index 2a16f0c9..e26edb11 100644 --- a/tests/integration/targets/setup_docker_registry/tasks/setup.yml +++ b/tests/integration/targets/setup_docker_registry/tasks/setup.yml @@ -41,7 +41,7 @@ msg: Using test registry name {{ docker_registry_container_name_registry }} and nginx frontend names {{ docker_registry_container_name_nginx }} and {{ docker_registry_container_name_nginx2 }} - ansible.builtin.fail: msg="Too old docker version to set up docker registry!" - when: not(docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6) + when: not(docker_api_version is version('1.25', '>=')) and (ansible_facts.distribution != 'CentOS' or ansible_facts.distribution_major_version|int > 6) - when: docker_api_version is version('1.25', '>=') block: diff --git a/tests/integration/targets/setup_docker_sdk_for_python/tasks/main.yml b/tests/integration/targets/setup_docker_sdk_for_python/tasks/main.yml index 0477a499..73431d6d 100644 --- a/tests/integration/targets/setup_docker_sdk_for_python/tasks/main.yml +++ b/tests/integration/targets/setup_docker_sdk_for_python/tasks/main.yml @@ -53,7 +53,7 @@ }} - name: Check docker-py version - ansible.builtin.command: "{{ ansible_python.executable }} -c 'import docker; print(docker.__version__)'" + ansible.builtin.command: "{{ ansible_facts.python.executable }} -c 'import docker; print(docker.__version__)'" register: docker_py_version_stdout ignore_errors: true diff --git a/tests/integration/targets/setup_epel/tasks/main.yml b/tests/integration/targets/setup_epel/tasks/main.yml index c43a78d9..2027fba5 100644 --- a/tests/integration/targets/setup_epel/tasks/main.yml +++ b/tests/integration/targets/setup_epel/tasks/main.yml @@ -10,6 +10,6 @@ - name: Install EPEL ansible.builtin.dnf: - name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/setup_epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm + name: https://s3.amazonaws.com/ansible-ci-files/test/integration/targets/setup_epel/epel-release-latest-{{ ansible_facts.distribution_major_version }}.noarch.rpm disable_gpg_check: true when: ansible_facts.distribution in ['RedHat', 'CentOS'] diff --git a/tests/integration/targets/setup_openssl/tasks/main.yml b/tests/integration/targets/setup_openssl/tasks/main.yml index d71de719..493dabf7 100644 --- a/tests/integration/targets/setup_openssl/tasks/main.yml +++ b/tests/integration/targets/setup_openssl/tasks/main.yml @@ -9,20 +9,20 @@ #################################################################### - name: Include OS-specific variables - ansible.builtin.include_vars: '{{ ansible_os_family }}.yml' - when: not ansible_os_family == "Darwin" + ansible.builtin.include_vars: '{{ ansible_facts.os_family }}.yml' + when: not ansible_facts.os_family == "Darwin" - name: Install cryptography (Python 3) become: true ansible.builtin.package: name: '{{ cryptography_package_name_python3 }}' - when: ansible_os_family != 'Darwin' and ansible_python_version is version('3.0', '>=') + when: ansible_facts.os_family != 'Darwin' and ansible_facts.python_version is version('3.0', '>=') - name: Install cryptography (Python 2) become: true ansible.builtin.package: name: '{{ cryptography_package_name }}' - when: ansible_os_family != 'Darwin' and ansible_python_version is version('3.0', '<') + when: ansible_facts.os_family != 'Darwin' and ansible_facts.python_version is version('3.0', '<') - name: Install cryptography (Darwin, and potentially upgrade for other OSes) become: true @@ -31,5 +31,5 @@ extra_args: "-c {{ remote_constraints }}" - name: Register cryptography version - ansible.builtin.command: "{{ ansible_python.executable }} -c 'import cryptography; print(cryptography.__version__)'" + ansible.builtin.command: "{{ ansible_facts.python.executable }} -c 'import cryptography; print(cryptography.__version__)'" register: cryptography_version diff --git a/tests/integration/targets/setup_paramiko/tasks/main.yml b/tests/integration/targets/setup_paramiko/tasks/main.yml index 5d8ea9c3..429b9fce 100644 --- a/tests/integration/targets/setup_paramiko/tasks/main.yml +++ b/tests/integration/targets/setup_paramiko/tasks/main.yml @@ -8,7 +8,7 @@ name: python-paramiko become: true when: - - ansible_distribution == 'CentOS' and ansible_distribution_major_version|int <= 7 + - ansible_facts.distribution == 'CentOS' and ansible_facts.distribution_major_version|int <= 7 - name: Install paramiko ansible.builtin.pip: diff --git a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml index a67e2f36..1aeeb649 100644 --- a/tests/integration/targets/setup_pkg_mgr/tasks/main.yml +++ b/tests/integration/targets/setup_pkg_mgr/tasks/main.yml @@ -12,20 +12,20 @@ pkg_mgr: community.general.pkgng ansible_pkg_mgr: community.general.pkgng cacheable: true - when: ansible_os_family == "FreeBSD" + when: ansible_facts.os_family == "FreeBSD" - ansible.builtin.set_fact: pkg_mgr: community.general.zypper ansible_pkg_mgr: community.general.zypper cacheable: true - when: ansible_os_family == "Suse" + when: ansible_facts.os_family == "Suse" - ansible.builtin.shell: # noqa: command-instead-of-module cmd: | sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/*.repo sed -i 's%#baseurl=http://mirror.centos.org/%baseurl=https://vault.centos.org/%g' /etc/yum.repos.d/*.repo - when: ansible_distribution in 'CentOS' and ansible_distribution_major_version == '7' + when: ansible_facts.distribution in 'CentOS' and ansible_facts.distribution_major_version == '7' - ansible.builtin.shell: # noqa: command-instead-of-module @@ -33,4 +33,4 @@ sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-*.repo sed -i 's%#baseurl=http://mirror.centos.org/$contentdir/$releasever/%baseurl=https://vault.centos.org/8.4.2105/%g' /etc/yum.repos.d/CentOS-Linux-*.repo ignore_errors: true # This fails for CentOS Stream 8 - when: ansible_distribution in 'CentOS' and ansible_distribution_major_version == '8' + when: ansible_facts.distribution in 'CentOS' and ansible_facts.distribution_major_version == '8' diff --git a/tests/integration/targets/setup_podman/tasks/main.yml b/tests/integration/targets/setup_podman/tasks/main.yml index 08913340..32599d2a 100644 --- a/tests/integration/targets/setup_podman/tasks/main.yml +++ b/tests/integration/targets/setup_podman/tasks/main.yml @@ -23,7 +23,7 @@ ansible.builtin.command: id -u register: podman_user_id - - when: not podman_setup_marker.stat.exists and not ansible_module_running_in_container + - when: not podman_setup_marker.stat.exists and not ansible_facts.module_running_in_container block: - name: Print information ansible.builtin.debug: @@ -67,13 +67,13 @@ state: touch when: podman_skip_cleanup - - when: not has_podman or ansible_module_running_in_container + - when: not has_podman or ansible_facts.module_running_in_container block: - ansible.builtin.set_fact: podman_cli_version: "0.0" podman_socket: "not available" - - when: has_podman and not ansible_module_running_in_container + - when: has_podman and not ansible_facts.module_running_in_container block: - name: Check Podman CLI version ansible.builtin.command: "podman version -f {% raw %}'{{.Client.Version}}'{% endraw %}" diff --git a/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml b/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml index 51e4b800..b9e98cc7 100644 --- a/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml +++ b/tests/integration/targets/setup_remote_tmp_dir/tasks/main.yml @@ -8,7 +8,7 @@ # and should not be used as examples of how to write Ansible roles # #################################################################### -- name: make sure we have the ansible_os_family and ansible_distribution_version facts +- name: make sure we have the ansible_facts.os_family and ansible_facts.distribution_version facts ansible.builtin.setup: gather_subset: distribution when: ansible_facts == {} @@ -16,5 +16,5 @@ - ansible.builtin.include_tasks: "{{ lookup('first_found', files) }}" vars: files: - - "{{ ansible_os_family | lower }}.yml" + - "{{ ansible_facts.os_family | lower }}.yml" - "default.yml"